NOMINMAXの定義をifndefで括る

sakura-editor · May 12, 2019 · 232c7ea · 232c7ea
1 parent 3de3153
commit 232c7ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/tests/unittests/test-int2dec.cpp b/tests/unittests/test-int2dec.cpp
@@ -1,7 +1,11 @@
 #include <gtest/gtest.h>
 
 #include <limits>
+
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif /* #ifndef NOMINMAX */
+
 #include <Windows.h>
 #include <tchar.h>
 #include "basis/primitive.h"

diff --git a/tests/unittests/test-is_mailaddress.cpp b/tests/unittests/test-is_mailaddress.cpp
@@ -24,7 +24,10 @@
 */
 #include <gtest/gtest.h>
 
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif /* #ifndef NOMINMAX */
+
 #include <tchar.h>
 #include <wchar.h>
 #include <assert.h>