diff src/share/vm/runtime/globals.hpp @ 4110:03865c41c4f3

Merge
author vladidan
date Tue, 06 Dec 2011 16:35:04 -0500
parents 1bbf5b6fb7b0 cd00eaeebef6
children 81f7362f7bed
line wrap: on
line diff
--- a/src/share/vm/runtime/globals.hpp	Fri Dec 02 21:10:45 2011 -0800
+++ b/src/share/vm/runtime/globals.hpp	Tue Dec 06 16:35:04 2011 -0500
@@ -243,6 +243,9 @@
   bool is_writeable() const;
   bool is_external() const;
 
+  bool is_unlocker_ext() const;
+  bool is_unlocked_ext() const;
+
   void print_on(outputStream* st, bool withComments = false );
   void print_as_flag(outputStream* st);
 };
@@ -3922,4 +3925,8 @@
 
 RUNTIME_OS_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG)
 
+// Extensions
+
+#include "runtime/globals_ext.hpp"
+
 #endif // SHARE_VM_RUNTIME_GLOBALS_HPP