Correct C90 warnings
Merge pull request #2264 from jacquesg/fix-warnings

Correct C90 warnings