am 259f06bf: am 46fa3763: Fix some -Wundef issues.

* commit '259f06bffb3e29fb18baadfed8a13907c7c912f0':
  Fix some -Wundef issues.