dtoolbase: fix NOMINMAX macro redefinition warning

2018-10-17 20:42:37 +09:00 · 2018-10-17 20:42:37 +09:00 · d6efceb1ed
parent 90cc8fe385
commit d6efceb1ed
1 changed files with 2 additions and 0 deletions
--- a/dtool/src/dtoolbase/dtoolbase.h
+++ b/dtool/src/dtoolbase/dtoolbase.h
@ -63,8 +63,10 @@
 /* Windows likes to define min() and max() macros, which will conflict with
   std::min() and std::max() respectively, unless we do this: */
 #ifdef WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
 #endif
+#endif

 #ifndef __has_builtin
 #define __has_builtin(x) 0