--- old/src/hotspot/share/utilities/globalDefinitions.hpp 2018-03-13 10:31:11.000000000 -0500 +++ new/src/hotspot/share/utilities/globalDefinitions.hpp 2018-03-13 10:31:10.000000000 -0500 @@ -1012,12 +1012,6 @@ #undef min #endif -// 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- // and 64-bit overloaded functions, which does not work, and having