comparison src/share/vm/runtime/arguments.hpp @ 2044:06f017f7daa7

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Fri, 07 Jan 2011 18:18:08 +0100
parents 2d26b0046e0d f95d63e2154a
children 0654ee04b214
comparison
equal deleted inserted replaced
1942:00bc9eaf0e24 2044:06f017f7daa7
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 24
25 #ifndef SHARE_VM_RUNTIME_ARGUMENTS_HPP
26 #define SHARE_VM_RUNTIME_ARGUMENTS_HPP
27
28 #include "runtime/java.hpp"
29 #include "runtime/perfData.hpp"
30 #include "utilities/top.hpp"
31
25 // Arguments parses the command line and recognizes options 32 // Arguments parses the command line and recognizes options
26 33
27 // Invocation API hook typedefs (these should really be defined in jni.hpp) 34 // Invocation API hook typedefs (these should really be defined in jni.hpp)
28 extern "C" { 35 extern "C" {
29 typedef void (JNICALL *abort_hook_t)(void); 36 typedef void (JNICALL *abort_hook_t)(void);
536 #ifdef KERNEL 543 #ifdef KERNEL
537 // For java kernel vm, return property string for kernel properties. 544 // For java kernel vm, return property string for kernel properties.
538 static char *get_kernel_properties(); 545 static char *get_kernel_properties();
539 #endif // KERNEL 546 #endif // KERNEL
540 }; 547 };
548
549 #endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP