am ba553472: am aeccbffd: Merge "Avoid mixing declarations and statements in C89 source files"

* commit 'ba553472948080e05c653c44ece1357946c6efcb':
  Avoid mixing declarations and statements in C89 source files