Merge commit '99ddeddc'

* commit '99ddeddc':
  ituh263dec: Have function signature match across declaration and definition

This commit is a noop, see 2d2b363cMerged-by: NClément Bœsch <cboesch@gopro.com>