diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/config.h b/src/3rdparty/javascriptcore/JavaScriptCore/config.h
index 2af2e7127ca029b12f6f2ab522eea967585b594e..6be10fcd568e06124e358685039705a4abfc5f91 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/config.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/config.h
@@ -39,10 +39,10 @@
 
 #if OS(WINDOWS)
 
-// If we don't define these, they get defined in windef.h. 
-// We want to use std::min and std::max
-#define max max
-#define min min
+// windef.h defines min and max unless NOMINMAX is defined.
+#ifndef NOMINMAX
+#  define NOMINMAX
+#endif
 
 #if !COMPILER(MSVC7) && !OS(WINCE)
 // We need to define this before the first #include of stdlib.h or it won't contain rand_s.