Mercurial > hg > truffle

diff src/share/vm/runtime/sharedRuntime.hpp @ 8003:3c9bc17b9403

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author bpittore
date Thu, 07 Feb 2013 16:05:48 -0500
parents db9981fd3124
children 5fc51c1ecdeb 28e5aed7f3a6 0f03ff49c720
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.hpp	Wed Feb 06 15:22:32 2013 -0800
+++ b/src/share/vm/runtime/sharedRuntime.hpp	Thu Feb 07 16:05:48 2013 -0500
@@ -32,6 +32,7 @@
 #include "memory/resourceArea.hpp"
 #include "runtime/threadLocalStorage.hpp"
 #include "utilities/hashtable.hpp"
+#include "utilities/macros.hpp"
 
 class AdapterHandlerEntry;
 class AdapterHandlerTable;
@@ -168,11 +169,11 @@
   static address raw_exception_handler_for_return_address(JavaThread* thread, address return_address);
   static address exception_handler_for_return_address(JavaThread* thread, address return_address);
 
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
   // G1 write barriers
   static void g1_wb_pre(oopDesc* orig, JavaThread *thread);
   static void g1_wb_post(void* card_addr, JavaThread* thread);
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
 
   // exception handling and implicit exceptions
   static address compute_compiled_exc_handler(nmethod* nm, address ret_pc, Handle& exception,