Merge change 4072

* changes:
  Make #define work again. (Had accidentally omitted the keyword.)