Merge pull request #2573 from wsnyder/preproc_concat

Fix define name concatenation