Fix up so it builds on all our platforms -- certain compilers weren't happy
before causing build-failures.

Tested with clang (base on 10.x), gcc-4.9 and gcc-4.2.1.

The bundled self-tests continue to NOT work -- upstream maintainer confirms
a problem and promises to try to test them...