made some edits to preprocessor macro conditionals

Allowed building under OS X 10.9.3 and Xcode/LLVM 5.1.1