diff options
| author | Fujii Hironori <Hironori.Fujii@sony.com> | 2023-01-12 06:57:51 +0900 |
|---|---|---|
| committer | Fujii Hironori <Hironori.Fujii@sony.com> | 2023-01-13 05:47:03 +0900 |
| commit | 8520ef522168882b602efa6c322592e0fe56689f (patch) | |
| tree | 11451d417183fce2d8235c4f72900473e6e677d1 /src/win32 | |
| parent | 1e0249ae0d2731043798da8616f2980f1c5328cf (diff) | |
| download | cairo-8520ef522168882b602efa6c322592e0fe56689f.tar.gz | |
Defining Windows version macros in meson.build
WINVER and _WIN32_WINNT macros were defined in each source files and
headers that were including <windows.h>. However, because DirectWrite
requires new Windows API, some files included <windows.h> without the
version macros. This inconsistency sometimes caused troubles.
Define the version macros in meson.build.
Diffstat (limited to 'src/win32')
| -rw-r--r-- | src/win32/cairo-win32-debug.c | 9 | ||||
| -rw-r--r-- | src/win32/cairo-win32-device.c | 9 | ||||
| -rw-r--r-- | src/win32/cairo-win32-display-surface.c | 9 | ||||
| -rw-r--r-- | src/win32/cairo-win32-font.c | 9 | ||||
| -rw-r--r-- | src/win32/cairo-win32-printing-surface.c | 9 | ||||
| -rw-r--r-- | src/win32/cairo-win32-surface.c | 9 | ||||
| -rw-r--r-- | src/win32/cairo-win32-system.c | 9 |
7 files changed, 0 insertions, 63 deletions
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 */ |