Fix MSVC warning C4005: 'NOMINMAX': macro redefinition.

BYVoid · Jul 27, 2024 · 8b632f0 · 8b632f0
1 parent 641bfe9
commit 8b632f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/SimpleConverter.cpp b/src/SimpleConverter.cpp
@@ -16,12 +16,6 @@
  * limitations under the License.
  */
 
-#ifdef _MSC_VER
-#define NOMINMAX
-#include <Windows.h>
-#undef NOMINMAX
-#endif // _MSC_VER
-
 #include "Config.hpp"
 #include "Converter.hpp"
 #include "UTF8Util.hpp"

diff --git a/src/UTF8Util.hpp b/src/UTF8Util.hpp
@@ -19,9 +19,10 @@
 #pragma once
 
 #ifdef _MSC_VER
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <Windows.h>
-#undef NOMINMAX
 #endif // _MSC_VER
 
 #include <cstring>