src/share/vm/utilities/globalDefinitions_gcc.hpp

rev 3115 : [mq]: osx-threadid

*** 85,102 ****
  #ifndef __OpenBSD__
  #include <ucontext.h>
  #endif
  #ifdef __APPLE__
    #include <AvailabilityMacros.h>
!   #if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4)
!     // Mac OS X 10.4 defines EFL_AC and EFL_ID,
!     // which conflict with hotspot variable names.
!     //
!     // This has been fixed in Mac OS X 10.5.
!     #undef EFL_AC
!     #undef EFL_ID
!   #endif
  #endif
  #include <sys/time.h>
  #endif // LINUX || _ALLBSD_SOURCE
  
  // 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures
--- 85,95 ----
  #ifndef __OpenBSD__
  #include <ucontext.h>
  #endif
  #ifdef __APPLE__
    #include <AvailabilityMacros.h>
!   #include <mach/mach.h>
  #endif
  #include <sys/time.h>
  #endif // LINUX || _ALLBSD_SOURCE
  
  // 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures