2007-03-26 Stepan Kasal <skasal@redhat.com>

	* tools/gnu/classpath/tools/javah/Main.java (cniOrJniSeen): New
	field.
	(getParser): Use new field.

2 files changed, 14 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ae99b7b2c..a0a2c894d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-26  Stepan Kasal  <skasal@redhat.com>

+

+	* tools/gnu/classpath/tools/javah/Main.java (cniOrJniSeen): New

+	field.

+	(getParser): Use new field.

+

 2007-03-25  Dalibor Topic  <robilad@kaffe.org>

 

 	* doc/cp-tools.texinfo: Fix node ordering.

diff --git a/tools/gnu/classpath/tools/javah/Main.java b/tools/gnu/classpath/tools/javah/Main.java
index dfa04c4c9..29c96cf5b 100644
--- a/tools/gnu/classpath/tools/javah/Main.java
+++ b/tools/gnu/classpath/tools/javah/Main.java
@@ -89,6 +89,9 @@ public class Main
   // True if we're emitting CNI code.
   boolean cni;
 
+  // True if we've seen -cni or -jni.
+  boolean cniOrJniSeen;
+
   // True if output files should always be written.
   boolean force;
 
@@ -243,8 +246,9 @@ public class Main
     {
       public void parsed(String arg0) throws OptionException
       {
-        if (cni)
+        if (cniOrJniSeen && cni)
           throw new OptionException("only one of -jni or -cni may be used");
+	cniOrJniSeen = true;
         cni = false;
       }
     });
@@ -252,6 +256,9 @@ public class Main
     {
       public void parsed(String arg0) throws OptionException
       {
+        if (cniOrJniSeen && ! cni)
+          throw new OptionException("only one of -jni or -cni may be used");
+	cniOrJniSeen = true;
         cni = true;
       }
     });