libjava

	* Updated headers.
libjava/classpath
	* tools/gnu/classpath/tools/javah/FieldHelper.java (print): Print
	'volatile' after field type.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121215 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 8 insertions, 3 deletions

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 489b9aa8cf7..ef572ddc2c8 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-26  Tom Tromey  <tromey@redhat.com>
+
+	* tools/gnu/classpath/tools/javah/FieldHelper.java (print): Print
+	'volatile' after field type.
+
 2007-01-23  Marco Trudel  <mtrudel@gmx.ch>
 
 	* java/util/Arrays.java (binarySearch): Change comparison order.
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class
index 430344c87c7..9b7169fe519 100644
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class
+++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java b/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java
index a9385e04d33..f1c369af267 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java
@@ -1,5 +1,5 @@
 /* FieldHelper.java - field helper methods for CNI
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -52,12 +52,12 @@ public class FieldHelper
     out.print("  ");
     if (Modifier.isStatic(field.access))
       out.print("static ");
-    if (Modifier.isVolatile(field.access))
-      out.print("volatile ");
     if ((field.value instanceof Integer) || (field.value instanceof Long))
       out.print("const ");
     out.print(Type.getType(field.desc));
     out.print(" ");
+    if (Modifier.isVolatile(field.access))
+      out.print("volatile ");
     boolean result = false;
     if (superType != null && ! Modifier.isStatic(field.access))
       {