From 3efea5ea282702da9bc7133c5f5adb8bc36b344d Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 11 Sep 2019 15:08:37 -0700 Subject: [PATCH] Don't have Windows headers define min/max, in case they're defined by application code --- include/SDL_egl.h | 3 +++ include/SDL_opengl_glext.h | 3 +++ include/SDL_syswm.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/include/SDL_egl.h b/include/SDL_egl.h index f50fa5c9b8be9..f95a9067ba412 100644 --- a/include/SDL_egl.h +++ b/include/SDL_egl.h @@ -390,6 +390,9 @@ typedef enum { #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif +#ifndef NOMINMAX /* don't define min() and max(). */ +#define NOMINMAX +#endif #include #if __WINRT__ diff --git a/include/SDL_opengl_glext.h b/include/SDL_opengl_glext.h index cd3869fe7f1e5..6a402b15a2235 100644 --- a/include/SDL_opengl_glext.h +++ b/include/SDL_opengl_glext.h @@ -40,6 +40,9 @@ extern "C" { #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif +#ifndef NOMINMAX /* don't define min() and max(). */ +#define NOMINMAX +#endif #include #endif diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h index 7aa8c6869bf1f..1469b235e7b4d 100644 --- a/include/SDL_syswm.h +++ b/include/SDL_syswm.h @@ -49,6 +49,9 @@ struct SDL_SysWMinfo; #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif +#ifndef NOMINMAX /* don't define min() and max(). */ +#define NOMINMAX +#endif #include #endif