Mercurial > hg > graal-jvmci-8

comparison src/os/linux/vm/jvm_linux.h @ 2044:06f017f7daa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Fri, 07 Jan 2011 18:18:08 +0100
parents f95d63e2154a
children 11c26bfcf8c7
comparison
equal deleted inserted replaced
1942:00bc9eaf0e24 2044:06f017f7daa7
1 /* 1 /*
2 * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1999, 2010, 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.
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 * or visit www.oracle.com if you need additional information or have any 20 * or visit www.oracle.com if you need additional information or have any
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24
25 #ifndef OS_LINUX_VM_JVM_LINUX_H
26 #define OS_LINUX_VM_JVM_LINUX_H
24 27
25 /* 28 /*
26 // HotSpot integration note: 29 // HotSpot integration note:
27 // 30 //
28 // This is derived from the JDK classic file: 31 // This is derived from the JDK classic file:
93 #endif /* JVM_MD_H */ 96 #endif /* JVM_MD_H */
94 97
95 // Reconciliation History 98 // Reconciliation History
96 // jvm_solaris.h 1.6 99/06/22 16:38:47 99 // jvm_solaris.h 1.6 99/06/22 16:38:47
97 // End 100 // End
101
102 #endif // OS_LINUX_VM_JVM_LINUX_H