Macros

Added macros to fix compiler issues for older code with older versions
of Xcode