1.1 --- a/src/share/vm/runtime/java.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/runtime/java.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -64,6 +64,7 @@
1.4 #include "utilities/dtrace.hpp"
1.5 #include "utilities/globalDefinitions.hpp"
1.6 #include "utilities/histogram.hpp"
1.7 +#include "utilities/macros.hpp"
1.8 #include "utilities/vmError.hpp"
1.9 #ifdef TARGET_ARCH_x86
1.10 # include "vm_version_x86.hpp"
1.11 @@ -80,11 +81,11 @@
1.12 #ifdef TARGET_ARCH_ppc
1.13 # include "vm_version_ppc.hpp"
1.14 #endif
1.15 -#ifndef SERIALGC
1.16 +#if INCLUDE_ALL_GCS
1.17 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
1.18 #include "gc_implementation/parallelScavenge/psScavenge.hpp"
1.19 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
1.20 -#endif
1.21 +#endif // INCLUDE_ALL_GCS
1.22 #ifdef COMPILER1
1.23 #include "c1/c1_Compiler.hpp"
1.24 #include "c1/c1_Runtime1.hpp"
