Fix build errors on Mac
Merge pull request #950 from kingFighter/mac

Fix build errors on Mac