PR classpath/40188: javah creates constants using name of the superclass

2011-07-07  Andrew John Hughes  <ahughes@redhat.com>

	PR classpath/40188
	* tools/gnu/classpath/tools/javah/JniIncludePrinter.java:
	(writeFields(ClassWrapper,JniPrintStream)): Retain a
	reference to the original class and use it in naming
	fields, as opposed to the class in which it occurs.

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index de6fbd1b3..eb30d80b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-07  Andrew John Hughes  <ahughes@redhat.com>
+
+	PR classpath/40188
+	* tools/gnu/classpath/tools/javah/JniIncludePrinter.java:
+	(writeFields(ClassWrapper,JniPrintStream)): Retain a
+	reference to the original class and use it in naming
+	fields, as opposed to the class in which it occurs.
+
 2011-07-05  Pekka Enberg  <penberg@kernel.org>
 
 	* configure.ac:
diff --git a/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
index cb8bcd8d9..cf5fed39f 100644
--- a/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
+++ b/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
@@ -1,5 +1,5 @@
 /* JniIncludePrinter.java - Generate a JNI header file
- Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007, 2011 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -63,6 +63,7 @@ public class JniIncludePrinter
   {
     klass.linkSupers();
     boolean wroteAny = false;
+    ClassWrapper headerClass = klass;
     for (; klass != null; klass = klass.superClass)
       {
         Iterator<?> i = klass.fields.iterator();
@@ -77,7 +78,7 @@ public class JniIncludePrinter
               continue;
 
             // Note that we don't want to mangle the field name.
-            String name = (JniHelper.mangle(klass.name) + "_" + field.name);
+            String name = (JniHelper.mangle(headerClass.name) + "_" + field.name);
             out.print("#undef ");
             out.println(name);
             out.print("#define ");