diff src/share/vm/runtime/globals.hpp @ 372:be41fa651400

Merge
author rasbold
date Tue, 30 Sep 2008 15:53:55 -0700
parents 032ddb9432ad 885fe0f95828
children ddfad9496151 cc80376deb0c
line wrap: on
line diff
--- a/src/share/vm/runtime/globals.hpp	Wed Sep 24 15:34:06 2008 -0400
+++ b/src/share/vm/runtime/globals.hpp	Tue Sep 30 15:53:55 2008 -0700
@@ -707,7 +707,7 @@
   diagnostic(bool, PrintAssembly, false,                                    \
           "Print assembly code (using external disassembler.so)")           \
                                                                             \
-  diagnostic(ccstr, PrintAssemblyOptions, false,                            \
+  diagnostic(ccstr, PrintAssemblyOptions, NULL,                             \
           "Options string passed to disassembler.so")                       \
                                                                             \
   diagnostic(bool, PrintNMethods, false,                                    \
@@ -848,7 +848,7 @@
           "Use LWP-based instead of libthread-based synchronization "       \
           "(SPARC only)")                                                   \
                                                                             \
-  product(ccstr, SyncKnobs, "",                                             \
+  product(ccstr, SyncKnobs, NULL,                                           \
           "(Unstable) Various monitor synchronization tunables")            \
                                                                             \
   product(intx, EmitSync, 0,                                                \
@@ -1032,7 +1032,7 @@
   notproduct(bool, TraceJVMCalls, false,                                    \
           "Trace JVM calls")                                                \
                                                                             \
-  product(ccstr, TraceJVMTI, "",                                            \
+  product(ccstr, TraceJVMTI, NULL,                                          \
           "Trace flags for JVMTI functions and events")                     \
                                                                             \
   /* This option can change an EMCP method into an obsolete method. */      \