summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-01-23 14:15:01 +0100
committerAttila Molnar <attilamolnar@hush.com>2014-01-23 14:15:01 +0100
commit2f3c378a3974cc206cf4e184dec9b303ce2ee43a (patch)
tree9d11e2029ce1bf1ee5799667b5421562a19b8c09
parent87ec27cf3c5a70a0d12244c847c4a8befaa7a8e2 (diff)
Globally #undef min and max on Windows
-rw-r--r--src/modules/m_repeat.cpp5
-rw-r--r--win/inspircd_win32wrapper.h4
2 files changed, 3 insertions, 6 deletions
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