am 8ff6e596: Merge "Don\'t rely on gcc extensions"

* commit '8ff6e5967f93ec1188e34834c1f1240b516e32dc':
  Don't rely on gcc extensions