instead, define the FILE_OFFSET_BITS part in the build environment, and remove it...

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index 903bee1e6868edbe8363ea1791f2f5fdefccfcd8..695f34651893c63047cff347ec83e4bc1421d767 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -4,7 +4,9 @@
 
 #ifdef WIN32
 # ifdef _WIN64
-#  define _WIN32_WINNT 0x0502
+#  ifndef _WIN32_WINNT
+#   define _WIN32_WINNT 0x0502
+#  endif
    // for SetDllDirectory
 # endif
 # include <windows.h>
@@ -232,8 +234,12 @@ void* Sys_GetProcAddress (dllhandle_t handle, const char* name)
 # define HAVE_GETTIMEOFDAY 1
 #endif
 
-#ifdef FD_SET
-# define HAVE_SELECT 1
+#ifndef WIN32
+// on Win32, select() cannot be used with all three FD list args being NULL according to MSDN
+// (so much for POSIX...)
+# ifdef FD_SET
+#  define HAVE_SELECT 1
+# endif
 #endif
 
 #ifndef WIN32