Globally #undef min and max on Windows

diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index 69946ed0c47e9a003d3d45f4eab0621ce8589008..d91fe7e8a5f1a868b5f84614292071762124d11a 100644 (file)
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -19,11 +19,6 @@
 
 #include "inspircd.h"
 
-#ifdef _WIN32
-// windows.h defines this
-#undef min
-#endif
-
 class RepeatMode : public ModeHandler
 {
  private:

diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index a7f2b4354ce3c3abf03cae8c2939b701de4484c0..0b9216313ca921c88545eb4855d250c65449a657 100644 (file)
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -75,8 +75,10 @@
 #define W_OK            (1<<1)  /* test for write permission */
 #define R_OK            (1<<2)  /* test for read permission */
 
-/* Windows defines this already. */
+// Windows defines these already.
 #undef ERROR
+#undef min
+#undef max
 
 /* strcasecmp is not defined on windows by default */
 #define strcasecmp _stricmp