fix gcc compilation
Merge branch 'master' of https://github.com/wesnoth/wesnoth