aboutsummaryrefslogtreecommitdiffstats
path: root/include/gos
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-11-16 01:53:00 +1000
committerinmarket <andrewh@inmarket.com.au>2013-11-16 01:53:00 +1000
commit539c6c305a5d5977db32805cb7671a689649909e (patch)
treefc5c498a0995ec60e1160021412825f3f3b1e8ce /include/gos
parentdb74e7c8231aebc10e4cb6a13c986591b64b3c3c (diff)
downloaduGFX-539c6c305a5d5977db32805cb7671a689649909e.tar.gz
uGFX-539c6c305a5d5977db32805cb7671a689649909e.tar.bz2
uGFX-539c6c305a5d5977db32805cb7671a689649909e.zip
Fix Win32 GOS layer to allow later inclusion of WinSock2.
Diffstat (limited to 'include/gos')
-rw-r--r--include/gos/win32.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/gos/win32.h b/include/gos/win32.h
index 766be3af..121bdb5a 100644
--- a/include/gos/win32.h
+++ b/include/gos/win32.h
@@ -15,8 +15,15 @@
#if GFX_USE_OS_WIN32
-//#define WIN32_LEAN_AND_MEAN
+#ifndef _WIN32_WINNT
+ #define _WIN32_WINNT 0x0501 // Windows XP and up
+#endif
+
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+
+#include <malloc.h>
/* Stop cygwin from defining these types */
#define __int8_t_defined