1.1 --- a/src/share/vm/memory/freeBlockDictionary.cpp Fri Jan 18 05:33:32 2013 -0800 1.2 +++ b/src/share/vm/memory/freeBlockDictionary.cpp Wed Jan 23 13:02:39 2013 -0500 1.3 @@ -23,13 +23,15 @@ 1.4 */ 1.5 1.6 #include "precompiled.hpp" 1.7 -#ifndef SERIALGC 1.8 +#include "utilities/macros.hpp" 1.9 +#if INCLUDE_ALL_GCS 1.10 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" 1.11 -#endif // SERIALGC 1.12 +#endif // INCLUDE_ALL_GCS 1.13 #include "memory/freeBlockDictionary.hpp" 1.14 #include "memory/metablock.hpp" 1.15 #include "memory/metachunk.hpp" 1.16 #include "runtime/thread.inline.hpp" 1.17 +#include "utilities/macros.hpp" 1.18 1.19 #ifndef PRODUCT 1.20 template <class Chunk> Mutex* FreeBlockDictionary<Chunk>::par_lock() const { 1.21 @@ -56,7 +58,7 @@ 1.22 template class FreeBlockDictionary<Metablock>; 1.23 template class FreeBlockDictionary<Metachunk>; 1.24 1.25 -#ifndef SERIALGC 1.26 +#if INCLUDE_ALL_GCS 1.27 // Explicitly instantiate for FreeChunk 1.28 template class FreeBlockDictionary<FreeChunk>; 1.29 -#endif // SERIALGC 1.30 +#endif // INCLUDE_ALL_GCS