From f59d2a7c86c5d8834ca0558682cac83e31035e68 Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@avtrex.com>
Date: Thu, 17 May 2007 03:53:45 +0000
Subject: [PATCH] java-stack.h (_Jv_FrameInfo): Remove union definition.

	* include/java-stack.h (_Jv_FrameInfo): Remove union definition.
	(_Jv_StackFrame): Remove commented out code.
	(_Jv_UnwindState): Remove superfluous 'typedef'.
	* sun/misc/natUnsafe.cc (spinlock): Add white space to quiet
	compiler warnings.
	* gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc
	(getCollectionUsage): Don't declare unused parameter n.
	(getMemoryManagerNames): Same.
	* gnu/gcj/util/natGCInfo.cc (gc_debug_info): Remove superfluous
	'typedef'.

From-SVN: r124783
---
 libjava/ChangeLog                                           | 13 +++++++++++++
 libjava/gnu/gcj/util/natGCInfo.cc                           |  2 +-
 .../gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc   |  4 ++--
 libjava/include/java-stack.h                                |  7 +------
 libjava/sun/misc/natUnsafe.cc                               |  3 ++-
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0f27b416650..1aae32413bf 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,16 @@
+2007-05-16  David Daney  <ddaney@avtrex.com>
+
+	* include/java-stack.h (_Jv_FrameInfo): Remove union definition.
+	(_Jv_StackFrame): Remove commented out code.
+	(_Jv_UnwindState): Remove superfluous 'typedef'.
+	* sun/misc/natUnsafe.cc (spinlock): Add white space to quiet
+	compiler warnings.
+	* gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc
+	(getCollectionUsage): Don't declare unused parameter n.
+	(getMemoryManagerNames): Same.
+	* gnu/gcj/util/natGCInfo.cc (gc_debug_info): Remove superfluous
+	'typedef'.
+
 2007-05-16  Keith Seitz  <keiths@redhat.com>
 
 	* include/java-interp.h (breakpoint_at): Declare.
diff --git a/libjava/gnu/gcj/util/natGCInfo.cc b/libjava/gnu/gcj/util/natGCInfo.cc
index 7e5c6fbb845..8fe049aace0 100644
--- a/libjava/gnu/gcj/util/natGCInfo.cc
+++ b/libjava/gnu/gcj/util/natGCInfo.cc
@@ -66,7 +66,7 @@ extern "C" {
 
 static int gc_ok = 1;
 
-typedef struct gc_debug_info
+struct gc_debug_info
 {
   int used;
   int free;
diff --git a/libjava/gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc b/libjava/gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc
index b7a250955ad..7bc0162d3d9 100644
--- a/libjava/gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc
+++ b/libjava/gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc
@@ -20,7 +20,7 @@ details.  */
 #include <java/lang/UnsupportedOperationException.h>
 
 ::java::lang::management::MemoryUsage *
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getCollectionUsage(jstring n)
+gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getCollectionUsage(jstring)
 {
   throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 ("gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getCollectionUsage (::java::lang::String *) not implemented"));
 }
@@ -41,7 +41,7 @@ gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getCollectionUsageThreshold
 
 
 JArray< ::java::lang::String *> *
-gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getMemoryManagerNames(jstring n)
+gnu::java::lang::management::VMMemoryPoolMXBeanImpl::getMemoryManagerNames(jstring)
 {
   return (JArray<jstring>*)
     JvNewObjectArray(1, &::java::lang::String::class$, JvNewStringLatin1("BoehmGC"));
diff --git a/libjava/include/java-stack.h b/libjava/include/java-stack.h
index 49e68412be6..40ce825b01f 100644
--- a/libjava/include/java-stack.h
+++ b/libjava/include/java-stack.h
@@ -49,10 +49,6 @@ struct _Jv_InterpFrameInfo
 };
 #endif
 
-union _Jv_FrameInfo
-{
-};
-
 struct _Jv_StackFrame
 {
   _Jv_FrameType type;   /* Native or interpreted.  */
@@ -69,12 +65,11 @@ struct _Jv_StackFrame
       void *start_ip;
     };
   };
-//  _Jv_FrameInfo info;   /* Frame-type specific data.  */
   jclass klass;
   _Jv_Method *meth;
 };
 
-typedef struct _Jv_UnwindState;
+struct _Jv_UnwindState;
 typedef _Unwind_Reason_Code (*_Jv_TraceFn) (_Jv_UnwindState *);
 
 struct _Jv_UnwindState
diff --git a/libjava/sun/misc/natUnsafe.cc b/libjava/sun/misc/natUnsafe.cc
index 7aa422e58dc..cc57dd59889 100644
--- a/libjava/sun/misc/natUnsafe.cc
+++ b/libjava/sun/misc/natUnsafe.cc
@@ -31,7 +31,8 @@ public:
 
 spinlock ()
   {
-    while (! compare_and_swap (&lock, 0, 1));
+    while (! compare_and_swap (&lock, 0, 1))
+      ;
   }
   ~spinlock ()
   {
-- 
2.11.4.GIT