am c643a4d4: am 2be3f09f: Merge "time: Improve C99 compliance"

* commit 'c643a4d4c71c2caaf016ab402fba99c1c9377567':
  time: Improve C99 compliance