diff src/share/vm/memory/collectorPolicy.cpp @ 8003:3c9bc17b9403

Merge
author bpittore
date Thu, 07 Feb 2013 16:05:48 -0500
parents db9981fd3124
children 1135141fb97e
line wrap: on
line diff
--- a/src/share/vm/memory/collectorPolicy.cpp	Wed Feb 06 15:22:32 2013 -0800
+++ b/src/share/vm/memory/collectorPolicy.cpp	Thu Feb 07 16:05:48 2013 -0500
@@ -39,10 +39,11 @@
 #include "runtime/java.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/vmThread.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
 #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
 #include "gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
 
 // CollectorPolicy methods.