Log Message:
Apply a patch from Ole Hellqvist in PR 26206 to make the main
structure definition use fixed-size fields, which should go some way
to fixing some problems on LP64 platforms.