1.1 --- a/src/share/vm/oops/objArrayKlass.inline.hpp Fri Jan 18 05:33:32 2013 -0800 1.2 +++ b/src/share/vm/oops/objArrayKlass.inline.hpp Wed Jan 23 13:02:39 2013 -0500 1.3 @@ -27,10 +27,11 @@ 1.4 1.5 #include "gc_implementation/shared/markSweep.inline.hpp" 1.6 #include "oops/objArrayKlass.hpp" 1.7 -#ifndef SERIALGC 1.8 +#include "utilities/macros.hpp" 1.9 +#if INCLUDE_ALL_GCS 1.10 #include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp" 1.11 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp" 1.12 -#endif 1.13 +#endif // INCLUDE_ALL_GCS 1.14 1.15 void ObjArrayKlass::oop_follow_contents(oop obj, int index) { 1.16 if (UseCompressedOops) { 1.17 @@ -63,7 +64,7 @@ 1.18 } 1.19 } 1.20 1.21 -#ifndef SERIALGC 1.22 +#if INCLUDE_ALL_GCS 1.23 void ObjArrayKlass::oop_follow_contents(ParCompactionManager* cm, oop obj, 1.24 int index) { 1.25 if (UseCompressedOops) { 1.26 @@ -96,6 +97,6 @@ 1.27 cm->push_objarray(a, end_index); // Push the continuation. 1.28 } 1.29 } 1.30 -#endif // #ifndef SERIALGC 1.31 +#endif // INCLUDE_ALL_GCS 1.32 1.33 #endif // SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP