change memory option macros to be more consistent between C and C++ compilers