am 0db9ea92: Merge "Fix a preprocessor warning exposed by -Wundef."

* commit '0db9ea923309f514a3216826593b325cffcfbbbf':
  Fix a preprocessor warning exposed by -Wundef.