bug-20650: Fix compile errors on Solaris
bug-20650: Fix RHEL5 compilation error introduced by Solaris fix