Merge "time: Improve C99 compliance"