0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid MSVC warnings about macro redefinitions INADDR_ANY, -BROADCAST, -NONE

Browse source
This commit is contained in:
anonymissimus 2014-12-03 14:35:25 +01:00
parent 6983cfb53e
commit fbd8652495
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game_preferences.cpp
View file

@ -34,6 +34,15 @@
#include <cassert>
#ifdef _WIN32
#include <boost/range/iterator_range.hpp>
#ifdef INADDR_ANY
#undef INADDR_ANY
#endif
#ifdef INADDR_BROADCAST
#undef INADDR_BROADCAST
#endif
#ifdef INADDR_NONE
#undef INADDR_NONE
#endif
#include <windows.h> //GetUserName
#endif

9
src/wesnoth.cpp
View file

@ -89,6 +89,15 @@
//#define NO_CATCH_AT_GAME_END
#ifdef _WIN32
#ifdef INADDR_ANY
#undef INADDR_ANY
#endif
#ifdef INADDR_BROADCAST
#undef INADDR_BROADCAST
#endif
#ifdef INADDR_NONE
#undef INADDR_NONE
#endif
#include <windows.h>
#endif