Commits
Dana Robinson committed c2f2f457d85
[svn-r28541] Merge of r28538 from the trunk.
Fixes OS X compilation problems and brings some Linux symbols in
line with the Autotools when building with CMake.
Tested on: 64-bit OS X 10.11.1 El Capitan (Darwin 15.0.0)
Xcode 7.1 Apple LLVM 7.0.0 (clang-700.1.76)