am 87879839: Fix build on MacOS 10.7 / XCode 4

* commit '87879839f19faaa30577435842294edf3e562f66':
  Fix build on MacOS 10.7 / XCode 4