Ooops, stupid typo in previous
Fix build on OSX.
Apply upstream patch to fix build on OSX.