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

* commit '2be3f09f2d9b6d35b262f7a6148f51c164bb8cbb':
  time: Improve C99 compliance