--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Tue Nov 23 15:01:43 2010 -0500
+++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Tue Nov 23 13:22:55 2010 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,16 @@
*
*/
+#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_INLINE_HPP
+#define SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_INLINE_HPP
+
+#include "gc_implementation/shared/markSweep.hpp"
+#include "gc_interface/collectedHeap.hpp"
+#include "utilities/stack.inline.hpp"
+#ifndef SERIALGC
+#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
+#endif
+
inline void MarkSweep::mark_object(oop obj) {
// some marks may contain information we need to preserve so we store them away
// and overwrite the mark. We'll restore it at the end of markSweep.
@@ -115,3 +125,5 @@
#endif
mark_and_push(p);
}
+
+#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_INLINE_HPP