*** old/src/hotspot/share/utilities/globalDefinitions.hpp	Tue Mar 13 10:31:11 2018
--- new/src/hotspot/share/utilities/globalDefinitions.hpp	Tue Mar 13 10:31:10 2018

*** 1010,1025 ****
--- 1010,1019 ----
  
  #ifdef min
  #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
  // explicitly-typed versions of these routines (i.e., MAX2I, MAX2L)
  // will be even more error-prone than macros.