1.1 --- a/src/share/vm/utilities/globalDefinitions_gcc.hpp Fri Feb 17 15:55:27 2012 -0800
1.2 +++ b/src/share/vm/utilities/globalDefinitions_gcc.hpp Sun Feb 19 13:11:39 2012 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -87,14 +87,7 @@
1.11 #endif
1.12 #ifdef __APPLE__
1.13 #include <AvailabilityMacros.h>
1.14 - #if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4)
1.15 - // Mac OS X 10.4 defines EFL_AC and EFL_ID,
1.16 - // which conflict with hotspot variable names.
1.17 - //
1.18 - // This has been fixed in Mac OS X 10.5.
1.19 - #undef EFL_AC
1.20 - #undef EFL_ID
1.21 - #endif
1.22 + #include <mach/mach.h>
1.23 #endif
1.24 #include <sys/time.h>
1.25 #endif // LINUX || _ALLBSD_SOURCE
