Mercurial > hg > truffle
diff src/share/vm/prims/jvmtiExport.cpp @ 8003:3c9bc17b9403
Merge
author | bpittore |
---|---|
date | Thu, 07 Feb 2013 16:05:48 -0500 |
parents | 8b46b0196eb0 db9981fd3124 |
children | 0b7f78069732 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiExport.cpp Wed Feb 06 15:22:32 2013 -0800 +++ b/src/share/vm/prims/jvmtiExport.cpp Thu Feb 07 16:05:48 2013 -0500 @@ -50,9 +50,10 @@ #include "runtime/vframe.hpp" #include "services/attachListener.hpp" #include "services/serviceUtil.hpp" -#ifndef SERIALGC +#include "utilities/macros.hpp" +#if INCLUDE_ALL_GCS #include "gc_implementation/parallelScavenge/psMarkSweep.hpp" -#endif +#endif // INCLUDE_ALL_GCS #ifdef JVMTI_TRACE #define EVT_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) & JvmtiTrace::SHOW_EVENT_SENT) != 0) { SafeResourceMark rm; tty->print_cr out; }