Merge pull request #1793 from rubenk/fix-riemann-plugin-on-32bit-solaris