CPP macros to allow compiling of cmm in 7.6.2 and HEAD