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

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