diff --git a/taglib/toolkit/taglib.h b/taglib/toolkit/taglib.h
old mode 100644
new mode 100755
index d41e419e..9ecdd365
--- a/taglib/toolkit/taglib.h
+++ b/taglib/toolkit/taglib.h
@@ -48,7 +48,9 @@
 #  include <libkern/OSAtomic.h>
 #  define TAGLIB_ATOMIC_MAC
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  define NOMINMAX
+#  if !defined(NOMINMAX)
+#    define NOMINMAX
+#  endif
 #  include <windows.h>
 #  define TAGLIB_ATOMIC_WIN
 #elif defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)    \