Compile fix for Solaris.

5 files changed