SmartOS (Solaris) build
SmartOS build fix
Merge remote-tracking branch 'refs/remotes/origin/master'
use __sun instead of sun
Merge pull request #171 from firepick1/master

Solaris build fix