[cairo-commit] src/cairo-mutex-private.h src/cairo-win32-surface.c

[Carl Worth]

 src/cairo-mutex-private.h |   12 ------------
 src/cairo-win32-surface.c |   11 ++++++-----
 2 files changed, 6 insertions(+), 17 deletions(-)

New commits:
diff-tree 4be608399f0d196a792f84fe4ddfce9acd2ea943 (from a5d1fc923fdef354ceed8478c93e8b7cb734158a)
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun Apr 29 19:29:24 2007 +0930

    Fix cygwin compile error
    
    The WINVER macros need to be defined before including <windows.h>.
    As a result of some recent include file rearranging, <windows.h>
    was included indirectly before WINVER was defined.

diff --git a/src/cairo-mutex-private.h b/src/cairo-mutex-private.h
index 9b9adba..85757a5 100644
--- a/src/cairo-mutex-private.h
+++ b/src/cairo-mutex-private.h
@@ -80,18 +80,6 @@ CAIRO_BEGIN_DECLS
 
 #elif HAVE_WINDOWS_H /*******************************************************/
 
-/* We require Windows 2000 features. Although we don't use them here, things
- * should still work if this header file ends up being the one to include
- * windows.h into a source file, so: */
-# if !defined(WINVER) || (WINVER < 0x0500)
-#  define WINVER 0x0500
-# endif
-
-# if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
-#  define _WIN32_WINNT 0x0500
-# endif
-
-# define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 
   typedef CRITICAL_SECTION cairo_mutex_t;
diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
index e680715..a907fd8 100644
--- a/src/cairo-win32-surface.c
+++ b/src/cairo-win32-surface.c
@@ -36,11 +36,6 @@
  *	Vladimir Vukicevic <vladimir at pobox.com>
  */
 
-#include "cairoint.h"
-
-#include "cairo-clip-private.h"
-#include "cairo-win32-private.h"
-
 #define WIN32_LEAN_AND_MEAN
 /* We require Windows 2000 features such as ETO_PDY */
 #if !defined(WINVER) || (WINVER < 0x0500)
@@ -49,6 +44,12 @@
 #if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
 # define _WIN32_WINNT 0x0500
 #endif
+
+#include "cairoint.h"
+
+#include "cairo-clip-private.h"
+#include "cairo-win32-private.h"
+
 #include <windows.h>
 
 #if defined(__MINGW32__) && !defined(ETO_PDY)