From 596438ca819090ac83159b4d068b78c17019c066 Mon Sep 17 00:00:00 2001 From: Stepan Kasal Date: Mon, 26 Mar 2007 22:15:14 +0000 Subject: Main.java (cniOrJniSeen): New field. 2007-03-26 Stepan Kasal * tools/gnu/classpath/tools/javah/Main.java (cniOrJniSeen): New field. (getParser): Use new field. From-SVN: r123240 --- libjava/classpath/ChangeLog | 6 ++++++ .../classes/gnu/classpath/tools/javah/Main$1.class | Bin 1002 -> 1002 bytes .../classes/gnu/classpath/tools/javah/Main$10.class | Bin 928 -> 928 bytes .../classes/gnu/classpath/tools/javah/Main$2.class | Bin 1106 -> 1106 bytes .../classes/gnu/classpath/tools/javah/Main$3.class | Bin 1111 -> 1111 bytes .../classes/gnu/classpath/tools/javah/Main$4.class | Bin 994 -> 994 bytes .../classes/gnu/classpath/tools/javah/Main$5.class | Bin 1056 -> 1056 bytes .../classes/gnu/classpath/tools/javah/Main$6.class | Bin 926 -> 926 bytes .../classes/gnu/classpath/tools/javah/Main$7.class | Bin 1004 -> 1051 bytes .../classes/gnu/classpath/tools/javah/Main$8.class | Bin 924 -> 1051 bytes .../classes/gnu/classpath/tools/javah/Main$9.class | Bin 960 -> 960 bytes .../classes/gnu/classpath/tools/javah/Main.class | Bin 10939 -> 10962 bytes .../tools/gnu/classpath/tools/javah/Main.java | 9 ++++++++- 13 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 330fe70..54f71df 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,9 @@ +2007-03-26 Stepan Kasal + + * tools/gnu/classpath/tools/javah/Main.java (cniOrJniSeen): New + field. + (getParser): Use new field. + 2007-03-17 Thomas Fitzsimmons * 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 5937740..9acfd81 100644 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 ed0500f..7feb934 100644 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 1eb1b1e..8148867 100644 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 a798489..00fd949 100644 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 0811703..818c3d4 100644 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 faa51e2..d0b741f 100644 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 10286fa..4e1c7f3 100644 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 6da557c..104ce2e 100644 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 16fe8a3..8b47b8c 100644 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 f4393f5..038d74d 100644 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 56c7f48..ac3fda8 100644 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 dfa04c4..29c96cf 100644 --- 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; } }); -- cgit v1.1