The other gcc2 fix wasn't quite right, but this one should work better. It doesn't introduce any failures in `make test', but I'm unsure if they are "safe" values for the buffer sizes. I'm sure you'll know better. The errors have to do with incomplete type definitions.
Created attachment 71684 [details, diff] gcc-2 fix
Nope, still wrong :(
wrong fix, please try again.