am 541a7804: am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.

* commit '541a780454ca5299a96a5d9bae1fcb650a0c0659':
  Fix build breakage for missing -Wcpp option on old GCC versions.