diff src/share/vm/c1/c1_CodeStubs.hpp @ 8002:8391fdd36e1f

Merge
author dlong
date Sun, 27 Jan 2013 01:07:09 -0800
parents db9981fd3124
children 46f6f063b272
line wrap: on
line diff
--- a/src/share/vm/c1/c1_CodeStubs.hpp	Fri Jan 25 03:03:23 2013 -0800
+++ b/src/share/vm/c1/c1_CodeStubs.hpp	Sun Jan 27 01:07:09 2013 -0800
@@ -31,6 +31,7 @@
 #include "c1/c1_LIR.hpp"
 #include "c1/c1_Runtime1.hpp"
 #include "utilities/array.hpp"
+#include "utilities/macros.hpp"
 
 class CodeEmitInfo;
 class LIR_Assembler;
@@ -515,7 +516,7 @@
 };
 
 //////////////////////////////////////////////////////////////////////////////////////////
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
 
 // Code stubs for Garbage-First barriers.
 class G1PreBarrierStub: public CodeStub {
@@ -608,7 +609,7 @@
 #endif // PRODUCT
 };
 
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
 //////////////////////////////////////////////////////////////////////////////////////////
 
 #endif // SHARE_VM_C1_C1_CODESTUBS_HPP