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.

See https://github.com/snoyberg/conduit/issues/182 and
https://github.com/snoyberg/conduit/pull/183
Version bump