Fix min build fail

KangLin · Jul 22, 2024 · 1ab93cb · 1ab93cb
1 parent 086f17c
commit 1ab93cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/common/rdr/HexInStream.cxx b/common/rdr/HexInStream.cxx
@@ -23,9 +23,9 @@
 
 using namespace rdr;
 
-#undef min
-
+#if !defined(_MSC_VER)
 static inline int min(int a, int b) {return a<b ? a : b;}
+#endif
 
 HexInStream::HexInStream(InStream& is)
 : in_stream(is)

diff --git a/common/rdr/HexOutStream.cxx b/common/rdr/HexOutStream.cxx
@@ -26,7 +26,7 @@
 
 using namespace rdr;
 
-#ifndef WIN32
+#ifndef _MSC_VER
 static inline size_t min(size_t a, size_t b) {return a<b ? a : b;}
 #endif