Improved solaris compatibility
17 files changed