--- a/hotspot/src/share/vm/runtime/objectMonitor.inline.hpp Tue Nov 23 15:01:43 2010 -0500
+++ b/hotspot/src/share/vm/runtime/objectMonitor.inline.hpp Tue Nov 23 13:22:55 2010 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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,9 @@
*
*/
+#ifndef SHARE_VM_RUNTIME_OBJECTMONITOR_INLINE_HPP
+#define SHARE_VM_RUNTIME_OBJECTMONITOR_INLINE_HPP
+
inline intptr_t ObjectMonitor::is_entered(TRAPS) const {
if (THREAD == _owner || THREAD->is_lock_owned((address) _owner)) {
return 1;
@@ -104,3 +107,5 @@
_count = 0;
}
+
+#endif // SHARE_VM_RUNTIME_OBJECTMONITOR_INLINE_HPP