summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boilerplate/cairo-boilerplate-win32-printing.c8
-rw-r--r--meson.build6
-rw-r--r--perf/cairo-perf.c1
-rw-r--r--perf/dirent-win32.h1
-rw-r--r--src/cairo-misc.c9
-rw-r--r--src/cairo-mutex-impl-private.h9
-rw-r--r--src/cairo-time.c1
-rw-r--r--src/cairo-wgl-context.c1
-rw-r--r--src/win32/cairo-win32-debug.c9
-rw-r--r--src/win32/cairo-win32-device.c9
-rw-r--r--src/win32/cairo-win32-display-surface.c9
-rw-r--r--src/win32/cairo-win32-font.c9
-rw-r--r--src/win32/cairo-win32-printing-surface.c9
-rw-r--r--src/win32/cairo-win32-surface.c9
-rw-r--r--src/win32/cairo-win32-system.c9
-rw-r--r--util/cairo-missing/cairo-missing.h1
16 files changed, 6 insertions, 94 deletions
diff --git a/boilerplate/cairo-boilerplate-win32-printing.c b/boilerplate/cairo-boilerplate-win32-printing.c
index 3d815167f..e8fcdcef5 100644
--- a/boilerplate/cairo-boilerplate-win32-printing.c
+++ b/boilerplate/cairo-boilerplate-win32-printing.c
@@ -26,14 +26,6 @@
* Adrian Johnson <ajohnson@redneon.com>
*/
-/* We require Windows 2000 features such as GetDefaultPrinter() */
-#if !defined(WINVER) || (WINVER < 0x0500)
-# define WINVER 0x0500
-#endif
-#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
-# define _WIN32_WINNT 0x0500
-#endif
-
#include "cairo-boilerplate-private.h"
#include "cairo-malloc-private.h"
diff --git a/meson.build b/meson.build
index 4dedeadee..fb5fd3a49 100644
--- a/meson.build
+++ b/meson.build
@@ -495,6 +495,8 @@ if host_machine.system() == 'darwin' and not get_option('quartz').disabled()
endif
if host_machine.system() == 'windows'
+ add_project_arguments('-DWIN32_LEAN_AND_MEAN', '-DNOMINMAX', language: ['c', 'cpp'])
+
win32_extra_deps = [
cc.find_library('gdi32'),
cc.find_library('msimg32'),
@@ -545,6 +547,10 @@ if host_machine.system() == 'windows'
if cpp_compiler.has_header('dwrite_3.h') and cpp_compiler.get_define('__MINGW32__') == ''
conf.set('HAVE_DWRITE_3_H', 1)
endif
+
+ add_project_arguments('-DWINVER=_WIN32_WINNT_WIN10', '-D_WIN32_WINNT=_WIN32_WINNT_WIN10', '-DNTDDI_VERSION=NTDDI_WIN10_RS3', language: ['c', 'cpp'])
+ else
+ add_project_arguments('-DWINVER=_WIN32_WINNT_WIN2K', '-D_WIN32_WINNT=_WIN32_WINNT_WIN2K', language: ['c', 'cpp'])
endif
endif
diff --git a/perf/cairo-perf.c b/perf/cairo-perf.c
index ebef8eb59..244d6cb74 100644
--- a/perf/cairo-perf.c
+++ b/perf/cairo-perf.c
@@ -37,7 +37,6 @@
#endif
#if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#elif defined(_POSIX_PRIORITY_SCHEDULING)
#include <sched.h>
diff --git a/perf/dirent-win32.h b/perf/dirent-win32.h
index 0f2ed05e5..435a6cfa2 100644
--- a/perf/dirent-win32.h
+++ b/perf/dirent-win32.h
@@ -26,7 +26,6 @@
#include "cairo-compiler-private.h"
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#define stat _stat
diff --git a/src/cairo-misc.c b/src/cairo-misc.c
index edbd98003..7ac0e8d05 100644
--- a/src/cairo-misc.c
+++ b/src/cairo-misc.c
@@ -976,15 +976,6 @@ _cairo_fopen (const char *filename, const char *mode, FILE **file_out)
#ifdef _WIN32
-#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 <io.h>
diff --git a/src/cairo-mutex-impl-private.h b/src/cairo-mutex-impl-private.h
index de0c9b21b..b9430beef 100644
--- a/src/cairo-mutex-impl-private.h
+++ b/src/cairo-mutex-impl-private.h
@@ -179,15 +179,6 @@
#elif defined(_WIN32) /******************************************************/
-#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>
typedef CRITICAL_SECTION cairo_mutex_impl_t;
diff --git a/src/cairo-time.c b/src/cairo-time.c
index c93205908..05b64e157 100644
--- a/src/cairo-time.c
+++ b/src/cairo-time.c
@@ -62,7 +62,6 @@ _cairo_time_get (void)
}
#elif _WIN32
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
static cairo_always_inline double
diff --git a/src/cairo-wgl-context.c b/src/cairo-wgl-context.c
index 487237446..b6cd803a0 100644
--- a/src/cairo-wgl-context.c
+++ b/src/cairo-wgl-context.c
@@ -43,7 +43,6 @@
#include "cairo-error-private.h"
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
typedef struct _cairo_wgl_context {
diff --git a/src/win32/cairo-win32-debug.c b/src/win32/cairo-win32-debug.c
index 5a971bd61..01410c896 100644
--- a/src/win32/cairo-win32-debug.c
+++ b/src/win32/cairo-win32-debug.c
@@ -37,15 +37,6 @@
* Vladimir Vukicevic <vladimir@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 "cairoint.h"
#include "cairo-win32-private.h"
diff --git a/src/win32/cairo-win32-device.c b/src/win32/cairo-win32-device.c
index 6fce722ec..781ee0cde 100644
--- a/src/win32/cairo-win32-device.c
+++ b/src/win32/cairo-win32-device.c
@@ -37,15 +37,6 @@
* Vladimir Vukicevic <vladimir@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 "cairoint.h"
#include "cairo-atomic-private.h"
diff --git a/src/win32/cairo-win32-display-surface.c b/src/win32/cairo-win32-display-surface.c
index 841725474..e3b3eec2f 100644
--- a/src/win32/cairo-win32-display-surface.c
+++ b/src/win32/cairo-win32-display-surface.c
@@ -37,15 +37,6 @@
* Vladimir Vukicevic <vladimir@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 "cairoint.h"
#include "cairo-clip-private.h"
diff --git a/src/win32/cairo-win32-font.c b/src/win32/cairo-win32-font.c
index 2003a2782..9f81adff0 100644
--- a/src/win32/cairo-win32-font.c
+++ b/src/win32/cairo-win32-font.c
@@ -33,15 +33,6 @@
* Contributor(s):
*/
-#define WIN32_LEAN_AND_MEAN
-/* We require Windows 2000 features such as GetGlyphIndices */
-#if !defined(WINVER) || (WINVER < 0x0500)
-# define WINVER 0x0500
-#endif
-#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
-# define _WIN32_WINNT 0x0500
-#endif
-
#include "cairoint.h"
#include "cairo-win32-private.h"
diff --git a/src/win32/cairo-win32-printing-surface.c b/src/win32/cairo-win32-printing-surface.c
index 602a4f3f0..352137a27 100644
--- a/src/win32/cairo-win32-printing-surface.c
+++ b/src/win32/cairo-win32-printing-surface.c
@@ -35,15 +35,6 @@
* Vladimir Vukicevic <vladimir@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 "cairoint.h"
#include "cairo-default-context-private.h"
diff --git a/src/win32/cairo-win32-surface.c b/src/win32/cairo-win32-surface.c
index e53c16540..ca5c9d823 100644
--- a/src/win32/cairo-win32-surface.c
+++ b/src/win32/cairo-win32-surface.c
@@ -37,15 +37,6 @@
* Vladimir Vukicevic <vladimir@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 "cairoint.h"
#include "cairo-backend-private.h"
diff --git a/src/win32/cairo-win32-system.c b/src/win32/cairo-win32-system.c
index 878553009..01bbe89df 100644
--- a/src/win32/cairo-win32-system.c
+++ b/src/win32/cairo-win32-system.c
@@ -50,15 +50,6 @@
#if CAIRO_MUTEX_IMPL_WIN32
#if !CAIRO_WIN32_STATIC_BUILD
-#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>
/* declare to avoid "no previous prototype for 'DllMain'" warning */
diff --git a/util/cairo-missing/cairo-missing.h b/util/cairo-missing/cairo-missing.h
index 741b498a8..5d947163f 100644
--- a/util/cairo-missing/cairo-missing.h
+++ b/util/cairo-missing/cairo-missing.h
@@ -38,7 +38,6 @@
#include <sys/types.h>
#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_)
View Lorry Controller Status