comparison src/share/vm/utilities/globalDefinitions_gcc.hpp @ 4834:74d14a44c398

Added tag jdk7u60-b01 for changeset 8fd0e931efa5
author asaha
date Wed, 27 Nov 2013 14:57:31 -0800
parents f08d439fab8c
children 58c34ffeff58
comparison
equal deleted inserted replaced
10:1ae9c860b39d 11:0431fbac9133
1 /* 1 /*
2 * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
85 #ifndef __OpenBSD__ 85 #ifndef __OpenBSD__
86 #include <ucontext.h> 86 #include <ucontext.h>
87 #endif 87 #endif
88 #ifdef __APPLE__ 88 #ifdef __APPLE__
89 #include <AvailabilityMacros.h> 89 #include <AvailabilityMacros.h>
90 #if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4) 90 #include <mach/mach.h>
91 // Mac OS X 10.4 defines EFL_AC and EFL_ID,
92 // which conflict with hotspot variable names.
93 //
94 // This has been fixed in Mac OS X 10.5.
95 #undef EFL_AC
96 #undef EFL_ID
97 #endif
98 #endif 91 #endif
99 #include <sys/time.h> 92 #include <sys/time.h>
100 #endif // LINUX || _ALLBSD_SOURCE 93 #endif // LINUX || _ALLBSD_SOURCE
101 94
102 // 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures 95 // 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures