From 74840d562b3a8226cb9ab2eca94bc061be6ae7ab Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 26 Mar 2007 22:10:11 +0000 Subject: 2007-03-26 Stepan Kasal * tools/gnu/classpath/tools/javah/Main.java (cniOrJniSeen): New field. (getParser): Use new field. --- tools/gnu/classpath/tools/javah/Main.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tools/gnu') 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; } }); -- cgit v1.2.1