From c07f4a333cbe35f276dab3f5f0ac0336dcca88ba Mon Sep 17 00:00:00 2001 From: Marcel Greter Date: Sat, 17 Mar 2018 01:39:27 +0100 Subject: [PATCH] Protect some header defines from redefining --- src/sass.hpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/sass.hpp b/src/sass.hpp index f0550490c..68f15f923 100644 --- a/src/sass.hpp +++ b/src/sass.hpp @@ -14,11 +14,17 @@ // aplies to MSVC and MinGW #ifdef _WIN32 // we do not want the ERROR macro -# define NOGDI +# ifndef NOGDI +# define NOGDI +# endif // we do not want the min/max macro -# define NOMINMAX +# ifndef NOMINMAX +# define NOMINMAX +# endif // we do not want the IN/OUT macro -# define _NO_W32_PSEUDO_MODIFIERS +# ifndef _NO_W32_PSEUDO_MODIFIERS +# define _NO_W32_PSEUDO_MODIFIERS +# endif #endif