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

[Jonathan Watt]

 src/cairo-win32-surface.c |   10 ++++++++++
 src/cairo-win32.h         |   10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
diff-tree d4a58b2437a21794562d874f3d390e0e59688bc0 (from e6369f9478e84e32ca19d5f204dbe3eee828c429)
Author: Jonathan Watt <jwatt at jwatt.org>
Date:   Thu Jan 4 16:46:22 2007 +0100

    Remove WINVER from public header file

diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
index 4fb09df..120849d 100644
--- a/src/cairo-win32-surface.c
+++ b/src/cairo-win32-surface.c
@@ -36,6 +36,16 @@
  *	Vladimir Vukicevic <vladimir at pobox.com>
  */
 
+#define WIN32_LEAN_AND_MEAN
+/* We require Windows 2000 features such as ETO_PDY */
+#if !defined(WINVER) || (WINVER < 0x0500)
+# define WINVER 0x0500
+#endif
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
+# define _WIN32_WINNT 0x0500
+#endif
+#include <windows.h>
+
 #include <stdio.h>
 #include "cairoint.h"
 #include "cairo-clip-private.h"
diff --git a/src/cairo-win32.h b/src/cairo-win32.h
index 17d02c5..8719d33 100644
--- a/src/cairo-win32.h
+++ b/src/cairo-win32.h
@@ -40,16 +40,6 @@
 
 #if CAIRO_HAS_WIN32_SURFACE
 
-#define WIN32_LEAN_AND_MEAN
-/* 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
 #include <windows.h>
 
 CAIRO_BEGIN_DECLS