From 46d8f2536307b26d84589081994b0df7cc64a8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 25 Feb 2021 11:38:07 +0100 Subject: [PATCH] external: don't define WIN32_LEAN_AND_MEAN just for shits and giggles. We're not including windows.h there (fortunately!), so there's no point in defining such a macro. Also the proper way would be defining it only if it's not already defined to avoid macro redefinition warnings. --- src/MagnumExternal/OpenGL/GL/flextGL.h | 1 - src/MagnumExternal/OpenGL/GL/flextGL.h.template | 1 - src/MagnumExternal/OpenGL/GLES2/flextGL.h | 1 - src/MagnumExternal/OpenGL/GLES2/flextGL.h.template | 1 - src/MagnumExternal/OpenGL/GLES3/flextGL.h | 1 - src/MagnumExternal/OpenGL/GLES3/flextGL.h.template | 1 - 6 files changed, 6 deletions(-) diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h b/src/MagnumExternal/OpenGL/GL/flextGL.h index 256b80ca9..e3fa1ee3e 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.h +++ b/src/MagnumExternal/OpenGL/GL/flextGL.h @@ -80,7 +80,6 @@ void flextGLInit(Magnum::GL::Context& context); #endif #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 #ifndef WINAPI #define WINAPI __stdcall #endif diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h.template b/src/MagnumExternal/OpenGL/GL/flextGL.h.template index 71cd158ea..69c22f1c0 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.h.template +++ b/src/MagnumExternal/OpenGL/GL/flextGL.h.template @@ -81,7 +81,6 @@ void flextGLInit(Magnum::GL::Context& context); #endif #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 #ifndef WINAPI #define WINAPI __stdcall #endif diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.h b/src/MagnumExternal/OpenGL/GLES2/flextGL.h index 2bce54cde..851e58f37 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.h @@ -67,7 +67,6 @@ void flextGLInit(Magnum::GL::Context& context); #endif #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 #ifndef WINAPI #define WINAPI __stdcall #endif diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template b/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template index 510c65a55..ed45a2949 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template +++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template @@ -68,7 +68,6 @@ void flextGLInit(Magnum::GL::Context& context); #endif #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 #ifndef WINAPI #define WINAPI __stdcall #endif diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h b/src/MagnumExternal/OpenGL/GLES3/flextGL.h index 86428b761..360803fee 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h @@ -72,7 +72,6 @@ void flextGLInit(Magnum::GL::Context& context); #endif #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 #ifndef WINAPI #define WINAPI __stdcall #endif diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template b/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template index d090bdd6d..e94ecd681 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template @@ -73,7 +73,6 @@ void flextGLInit(Magnum::GL::Context& context); #endif #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 #ifndef WINAPI #define WINAPI __stdcall #endif