Portability fixes for Solaris
Merge pull request #1355 from phkelley/development

Portability fixes for Solaris