Changeset 2873 for box/trunk/lib

Timestamp:

26/03/2011 23:21:03 (14 months ago)

Author:

chris

Message:

Define WINVER and _WIN32_WINNT to Windows 2000 to avoid importing WSAPoll
from winsock2.h, which conflicts with our definition of struct pollfd,
on Windows Vista and above.

File:

• box/trunk/lib/win32/emu.h (modified) (2 diffs)

box/trunk/lib/win32/emu.h

@@ -51 +51 @@
 #endif
 
+// WIN32_WINNT versions 0x0600 (Vista) and higher enable WSAPoll() in
+// winsock2.h, whose struct pollfd conflicts with ours below, so for
+// now we just set it lower than that, to Windows 2000.
+#ifdef WINVER
+        #if WINVER != 0x0500
+                #error Must include emu.h before setting WINVER
+        #endif
+#endif
+#define WINVER 0x0500
+
+#ifdef _WIN32_WINNT
+        #if _WIN32_WINNT != 0x0500
+                #error Must include emu.h before setting _WIN32_WINNT
+        #endif
+#endif
+#define _WIN32_WINNT 0x0500
+
 // Windows headers
 
@@ -287 +304 @@
 
 #define INFTIM -1
-#define POLLIN 0x1
-#define POLLERR 0x8
-#define POLLOUT 0x4
+
+#ifndef POLLIN
+#       define POLLIN 0x1
+#endif
+
+#ifndef POLLERR
+#       define POLLERR 0x8
+#endif
+
+#ifndef POLLOUT
+#       define POLLOUT 0x4
+#endif
 
 #define SHUT_RDWR SD_BOTH