r69940 broke it I believe. Attached patch seems like the reasonable fix.
Created attachment 71005 [details] Patch
Comment on attachment 71005 [details] Patch Wrong patch...
Created attachment 71006 [details] fixbuild.diff
Comment on attachment 71006 [details] fixbuild.diff Ossy suggested on IRC to just drop the const and r+ that, so I pushed it as r69944.