Main.java (cniOrJniSeen): New field.

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

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

From-SVN: r123240

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 330fe70fc570602e1e01c962a54080c30d09a55a..54f71df517e15ba7700cfc723f1115119f5483c0 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/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-17  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
        * resource/com/sun/tools/javac/messages.properties

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class
index 5937740302190b73ab7d6d4d09a4136d21e6666b..9acfd81d5b383f7bafbf1bc9970c743f3ef76365 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class
index ed0500f45edc859cf35c24bf56ab21697d31e144..7feb9340ae7c401f119b96e3823bf8d8959a0a7a 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class
index 1eb1b1e43232c12adacec646aa7ca31a32e0c2e4..81488678dd791431dced813acf55a04083c489ad 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class
index a798489e93c781ab7764a03a8e44f0c9b7b7649e..00fd9496221cbe4539020174b66c0d7cc3a3339b 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class
index 0811703a1e5fff66325b777e0bf38b745c78b186..818c3d46e4f59f0a15cf551deed7ff787929d831 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class
index faa51e20a530dbe15938b3e0b871f79d39ee01ed..d0b741f7d70d998fd2ea05660dc9b17ca4a48195 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class
index 10286fa7a07aa1d5dfcb92bd5300d469375ca702..4e1c7f3e538bfb8c14bd9ea00f5d0ca4e3c6511a 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class
index 6da557c37ac7a0fc8b623fa80027361686cacb64..104ce2ef951a0cb081043016b445034acf2552cb 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class
index 16fe8a3a6e5e1cd253dc78509e5c98f75eca6276..8b47b8cfc34dc6ccb7ee0dd7d7f8833efe41661b 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class
index f4393f56fda36d81525601da85e1733c62b1db80..038d74d0fdc73cc3e9ef0bb7f9d4010f9465ba4a 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class
index 56c7f488a24fb8b749a30b936a64299e3df668f0..ac3fda855420595e9998f3ffdd0fe95f62621288 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class differ

diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
index dfa04c4c9efb4a2284052fbd40ad570190d1941b..29c96cf5bba60b4cc46742c8cccbbc1da7711086 100644 (file)
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
+++ b/libjava/classpath/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;
       }
     });