Merge change 21834 into eclair

* changes:
  Allow '//'-style comments in #defines.