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
This commit is contained in:
Tor Lillqvist
2007-02-04 00:17:30 +00:00
committed by Tor Lillqvist
parent 11b9d1bab3
commit 2c35024fd8
2 changed files with 10 additions and 1 deletions

View File

@@ -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):

View File

@@ -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;