fixed compilation errors in Linux
Second attempt to fix gcc-4.4 errors

This time by renaming functions.
Merge remote branch 'upstream/master' into fixLinuxMouseWheel
Merge pull request #410 from AndO3131/fixLinuxMouseWheel

fixed compilation errors in Linux