Solaris compile fixes
3 files changed