--- old/src/share/vm/utilities/globalDefinitions.hpp	2017-06-01 12:17:54.968375021 +0200
+++ new/src/share/vm/utilities/globalDefinitions.hpp	2017-06-01 12:17:54.844375026 +0200
@@ -1095,8 +1095,11 @@
 #undef min
 #endif
 
-#define max(a,b) Do_not_use_max_use_MAX2_instead
-#define min(a,b) Do_not_use_min_use_MIN2_instead
+// The following defines serve the purpose of preventing use of accidentally
+// included min max macros from compiling, while continuing to allow innocent
+// min and max identifiers in the code to compile as intended.
+#define max max
+#define min min
 
 // It is necessary to use templates here. Having normal overloaded
 // functions does not work because it is necessary to provide both 32-