1.1 --- a/src/share/vm/oops/oop.psgc.inline.hpp Tue Nov 23 15:01:43 2010 -0500 1.2 +++ b/src/share/vm/oops/oop.psgc.inline.hpp Tue Nov 23 13:22:55 2010 -0800 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -22,6 +22,15 @@ 1.11 * 1.12 */ 1.13 1.14 +#ifndef SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP 1.15 +#define SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP 1.16 + 1.17 +#ifndef SERIALGC 1.18 +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" 1.19 +#include "gc_implementation/parallelScavenge/psScavenge.hpp" 1.20 +#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" 1.21 +#endif 1.22 + 1.23 // ParallelScavengeHeap methods 1.24 1.25 inline void oopDesc::push_contents(PSPromotionManager* pm) { 1.26 @@ -32,3 +41,5 @@ 1.27 } 1.28 // Else skip it. The typeArrayKlass in the header never needs scavenging. 1.29 } 1.30 + 1.31 +#endif // SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP