Fixing conditional compilation macros (again), adding OSX_MAX_ALLOWED variant too and fixing Travis-CI's Xcode4 compilation error.