I came, I saw, I hurfed a durf about macro redefinitions

Originally committed to SVN as r4781.
2010-09-14 23:53:22 +00:00 · 2010-09-14 23:53:22 +00:00 · 035694c9ae
parent 6f63041156
commit 035694c9ae
1 changed files with 2 additions and 0 deletions
--- a/aegisub/libaegisub/include/libaegisub/mutex.h
+++ b/aegisub/libaegisub/include/libaegisub/mutex.h
@ -119,7 +119,9 @@
 // To avoid macro definition of ERROR.
 # define NOGDI
 // To avoid macro definition of min/max.
+# ifndef NOMINMAX
 # define NOMINMAX
+# endif // NOMINMAX
 # include <windows.h>
  typedef CRITICAL_SECTION MutexType;
 #elif defined(HAVE_PTHREAD) && defined(HAVE_RWLOCK)