Fix build to compile on Mac.  Finally
Merge pull request #312 from mono/master

Fix build to compile on Mac.  Finally