Mercurial > hg > graal-compiler

diff src/share/vm/services/g1MemoryPool.hpp @ 8002:8391fdd36e1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dlong
date Sun, 27 Jan 2013 01:07:09 -0800
parents db9981fd3124
children de6a9e811145
line wrap: on
line diff
--- a/src/share/vm/services/g1MemoryPool.hpp	Fri Jan 25 03:03:23 2013 -0800
+++ b/src/share/vm/services/g1MemoryPool.hpp	Sun Jan 27 01:07:09 2013 -0800
@@ -25,11 +25,12 @@
 #ifndef SHARE_VM_SERVICES_G1MEMORYPOOL_HPP
 #define SHARE_VM_SERVICES_G1MEMORYPOOL_HPP
 
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
 #include "gc_implementation/g1/g1MonitoringSupport.hpp"
 #include "services/memoryPool.hpp"
 #include "services/memoryUsage.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
 
 // This file contains the three classes that represent the memory
 // pools of the G1 spaces: G1EdenPool, G1SurvivorPool, and