Merge pull request #1596 from rubenk/fix-a-few-more-prototypes
authorRuben Kerkhof <ruben@tilaa.nl>
Fri, 4 Mar 2016 11:14:55 +0000 (12:14 +0100)
committerRuben Kerkhof <ruben@tilaa.nl>
Fri, 4 Mar 2016 11:14:55 +0000 (12:14 +0100)
Fix a few more prototypes


Trivial merge