Mercurial > hg > graal-compiler
comparison src/share/vm/prims/jvmtiRawMonitor.hpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | 8b46b0196eb0 |
children |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1999, 2013, 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. |
23 */ | 23 */ |
24 | 24 |
25 #ifndef SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP | 25 #ifndef SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP |
26 #define SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP | 26 #define SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP |
27 | 27 |
28 #ifndef JVMTI_KERNEL | |
29 #include "runtime/objectMonitor.hpp" | 28 #include "runtime/objectMonitor.hpp" |
30 #include "utilities/growableArray.hpp" | 29 #include "utilities/growableArray.hpp" |
31 #endif | |
32 | 30 |
33 // | 31 // |
34 // class JvmtiRawMonitor | 32 // class JvmtiRawMonitor |
35 // | 33 // |
36 // Used by JVMTI methods: All RawMonitor methods (CreateRawMonitor, EnterRawMonitor, etc.) | 34 // Used by JVMTI methods: All RawMonitor methods (CreateRawMonitor, EnterRawMonitor, etc.) |