Merge branch 'preprocessor-fixes' into smtk-head

* preprocessor-fixes:
  Fix buffer overrun processing macro definitions