diff options
| author | Stijn Buys <ingar@osirion.org> | 2011-07-22 19:21:54 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2011-07-22 19:21:54 +0000 |
| commit | f6f4da07f8ed086d8f5fffdce7bb3e963e9128a1 (patch) | |
| tree | 8519b77313dca5d6f0b6dd4823f74bb17416e995 | |
| parent | 3d9b1b6366c2941e623e23243e9291da106775a7 (diff) | |
Make the windows build happy again.
| -rw-r--r-- | src/audio/audio.h | 1 | ||||
| -rw-r--r-- | src/dedicated/console.cc | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/audio/audio.h b/src/audio/audio.h index 073fb67..bab3402 100644 --- a/src/audio/audio.h +++ b/src/audio/audio.h @@ -11,6 +11,7 @@ #include "sys/sys.h" #ifdef _WIN32 +#include <winsock2.h> #include <windows.h> #endif diff --git a/src/dedicated/console.cc b/src/dedicated/console.cc index 2481f58..0c05d9c 100644 --- a/src/dedicated/console.cc +++ b/src/dedicated/console.cc @@ -19,6 +19,12 @@ #include "sys/consoleinterface.h" #ifdef HAVE_CURSES + +// MOUSE_MOVE has conflicting definitions on win32 +#ifdef MOUSE_MOVED +#undef MOUSE_MOVED +#endif + #include <curses.h> #endif |