Fix macro expansion on osx which have a sub-standard CPP.

Explicitely add the two variable names in the parameters of the macro
instead of doing text concatenation once with S and once with C.