am 80bc9315: Merge "Fix warning about undefined __LP64__"

* commit '80bc93153df481a2bb86bc2f384af681836f37a5':
  Fix warning about undefined __LP64__