Merge pull request #904 from berryzplus/feature/add_ifndef_NOMINMAX

NOMINMAXの定義をifndefで括る
sakura-editor · May 14, 2019 · 1fb09e9 · 1fb09e9
2 parents f9b9c95 + 232c7ea
commit 1fb09e9
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>