From b96104fe8f351c5b0add8e208e86e130c161bde8 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Wed, 16 Mar 2011 22:19:44 +0000
Subject: Ensure all four required version defines are set for windows builds

svn path=/trunk/netsurf/; revision=12082
---
 windows/Makefile.target | 7 +++++--
 windows/download.c      | 1 -
 windows/gui.c           | 1 -
 windows/localhistory.c  | 1 -
 windows/prefs.c         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'windows')

diff --git a/windows/Makefile.target b/windows/Makefile.target
index 9fbc53d65..d81e7d7ea 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -28,8 +28,11 @@
 	     -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows
 
   CFLAGS += -U__STRICT_ANSI__ -mwin32
-  # only windows versions after 2000 are supported
-  CFLAGS += '-DWINVER=0x0500'
+  # only windows versions after XP are supported
+  CFLAGS += '-DWINVER=0x0501'
+  CFLAGS += '-D_WIN32_WINNT=0x0501'
+  CFLAGS += '-D_WIN32_WINDOWS=0x0501'
+  CFLAGS += '-D_WIN32_IE=0x0501'
   WSCFLAGS := -std=c99 \
 	$(WARNFLAGS) -I. -I${MINGW_INSTALL_ENV}/include/ \
 	-DCURL_STATICLIB -DLIBXML_STATIC -g
diff --git a/windows/download.c b/windows/download.c
index f128eea51..7b069522e 100644
--- a/windows/download.c
+++ b/windows/download.c
@@ -17,7 +17,6 @@
  */
 
 #include <limits.h>
-#define _WIN32_IE 0x0500
 #include <windows.h>
 #include <shlobj.h>
 #include <sys/time.h>
diff --git a/windows/gui.c b/windows/gui.c
index d66f7a062..ab469c786 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -27,7 +27,6 @@
 
 #include <windows.h>
 #include <windowsx.h>
-#define _WIN32_IE (0x0501)
 #include <commctrl.h>
 
 #include "content/urldb.h"
diff --git a/windows/localhistory.c b/windows/localhistory.c
index 258d72df4..8f6235354 100644
--- a/windows/localhistory.c
+++ b/windows/localhistory.c
@@ -18,7 +18,6 @@
 
 #include <windows.h>
 #include <windowsx.h>
-#define _WIN32_IE (0x0501)
 #include <commctrl.h>
 
 #include "desktop/browser.h"
diff --git a/windows/prefs.c b/windows/prefs.c
index 0b3597d88..3a04a5925 100644
--- a/windows/prefs.c
+++ b/windows/prefs.c
@@ -17,8 +17,8 @@
  */
 
 #include <windows.h>
-#define _WIN32_IE (0x0501)
 #include <commctrl.h>
+
 #include "desktop/options.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-- 
cgit v1.2.3