Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/audio/audio.h1
-rw-r--r--src/dedicated/console.cc6
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