Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 2477:3449f5e02cc4
Merge
author | coleenp |
---|---|
date | Tue, 12 Apr 2011 14:18:53 -0700 |
parents | ed69575596ac 1dac0f3af89f |
children | 0654ee04b214 732454aaf5cb |
comparison
equal
deleted
inserted
replaced
2468:6c97c830fb6f | 2477:3449f5e02cc4 |
---|---|
57 #endif | 57 #endif |
58 #ifndef SERIALGC | 58 #ifndef SERIALGC |
59 #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" | 59 #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" |
60 #endif | 60 #endif |
61 | 61 |
62 #define DEFAULT_VENDOR_URL_BUG "http://java.sun.com/webapps/bugreport/crash.jsp" | 62 // Note: This is a special bug reporting site for the JVM |
63 #define DEFAULT_VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/crash.jsp" | |
63 #define DEFAULT_JAVA_LAUNCHER "generic" | 64 #define DEFAULT_JAVA_LAUNCHER "generic" |
64 | 65 |
65 char** Arguments::_jvm_flags_array = NULL; | 66 char** Arguments::_jvm_flags_array = NULL; |
66 int Arguments::_num_jvm_flags = 0; | 67 int Arguments::_num_jvm_flags = 0; |
67 char** Arguments::_jvm_args_array = NULL; | 68 char** Arguments::_jvm_args_array = NULL; |