Mercurial > hg > truffle
diff src/share/vm/utilities/globalDefinitions_gcc.hpp @ 4970:33df1aeaebbf
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Mon, 27 Feb 2012 13:10:13 +0100 |
| parents | 0368109684cb |
| children | 203f64878aab |
line wrap: on
line diff
--- a/src/share/vm/utilities/globalDefinitions_gcc.hpp Fri Feb 24 18:30:42 2012 -0800 +++ b/src/share/vm/utilities/globalDefinitions_gcc.hpp Mon Feb 27 13:10:13 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -87,14 +87,7 @@ #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 + #include <mach/mach.h> #endif #include <sys/time.h> #endif // LINUX || _ALLBSD_SOURCE