Attachment 150612 Details for Bug 233349 – patch, not tested

[patch] patch, not tested

gcjh-opts.patch (text/plain), 985 bytes, created by Stepan Kasal on 2007-03-21 19:15:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stepan Kasal

Created: 2007-03-21 19:15:59 UTC

Size: 985 bytes

patch

obsolete

>--- libjava/classpath/tools/gnu/classpath/tools/javah/Main.java.cniopt	2007-03-17 09:20:29.000000000 +0100
>+++ libjava/classpath/tools/gnu/classpath/tools/javah/Main.java	2007-03-21 17:31:09.552404000 +0100
>@@ -89,6 +89,9 @@
>   // True if we're emitting CNI code.
>   boolean cni;
> 
>+  // True if we're emitting CNI code.
>+  boolean cniOrJniSeen;
>+
>   // True if output files should always be written.
>   boolean force;
> 
>@@ -243,8 +246,9 @@
>     {
>       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 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;
>       }
>     });

Actions: View | Diff

Attachments on bug 233349: 150612