From: Attila Molnar <attilamolnar@hush.com>
Date: Thu, 23 Jan 2014 13:15:01 +0000 (+0100)
Subject: Globally #undef min and max on Windows
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=2f3c378a3974cc206cf4e184dec9b303ce2ee43a;p=user%2Fhenk%2Fcode%2Finspircd.git

Globally #undef min and max on Windows
---

diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index 69946ed0c..d91fe7e8a 100644
--- 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 a7f2b4354..0b9216313 100644
--- 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