From 2c35024fd8579eb289298e89a13b76850bb567a2 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Sun, 4 Feb 2007 00:17:30 +0000
Subject: [PATCH] Don't define BITMAPV5HEADER on mingw with w32api >= 3.8,
 which has it in

2007-02-04  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkcursor-win32.c: Don't define BITMAPV5HEADER on
	mingw with w32api >= 3.8, which has it in wingdi.h. (#403896)


svn path=/branches/gtk-2-10/; revision=17255
---
 ChangeLog                   | 5 +++++
 gdk/win32/gdkcursor-win32.c | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a053d002e0..339478316b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-04  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkcursor-win32.c: Don't define BITMAPV5HEADER on
+	mingw with w32api >= 3.8, which has it in wingdi.h. (#403896)
+
 2007-02-02  Mariano Suárez-Alvarez  <mariano@gnome.org>
 
 	* gtk/gtkcellrenderertext.c(gtk_cell_renderer_text_class_init):
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index edbdf23734..1a79362ef0 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -25,9 +25,13 @@
 #include "gdkcursor.h"
 #include "gdkprivate-win32.h"
 
+#ifdef __MINGW32__
+#include <w32api.h>
+#endif
+
 #include "xcursors.h"
 
-#if defined(__MINGW32__) || (defined(_MSC_VER) && (WINVER < 0x0500))
+#if (defined(__MINGW32__) && __W32API_MAJOR_VERSION <= 3 && __W32API_MINOR_VERSION < 8) || (defined(_MSC_VER) && (WINVER < 0x0500))
 typedef struct { 
   DWORD        bV5Size; 
   LONG         bV5Width;