Fix build for Mac and Xcode 5.
Merge pull request #1 from mogemimi/fix/build-on-mac

Fix build for Mac and Xcode 5.
update r477