re PR java/16474 (gcjh: Illegal C++ produced for some non-gcj bytecode)

2004-07-12  Bryce McKinlay  <mckinlay@redhat.com>

        PR java/16474
        gjavah.c (print_field_info): Emit constant only if field is static.

From-SVN: r84570

gcc/java/ChangeLog

+2004-07-12  Bryce McKinlay  <mckinlay@redhat.com>
+
+	PR java/16474
+	gjavah.c (print_field_info): Emit constant only if field is static.
+
 2004-07-11  Roger Sayle  <roger@eyesopen.com>
 
 	* expr.c (java_truthvalue_conversion, flush_quick_stack,

gcc/java/gjavah.c

@@ -719,11 +719,10 @@ print_field_info (FILE *stream, JCF* jcf, int name_index, int sig_index,
 
   fputs ("  ", out);
   if ((flags & ACC_STATIC))
-    fputs ("static ", out);
-
-  if ((flags & ACC_FINAL))
     {
-      if (current_field_value > 0)
+      fputs ("static ", out);
+
+      if ((flags & ACC_FINAL) && current_field_value > 0)
 	{
 	  char buffer[25];
 	  int done = 1;