mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-14 17:40:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

gjavah.c (java_no_argument): Renamed from no_argument to avoid losing due to namespace pollution in GNU getopt.h

Browse Source 
* gjavah.c (java_no_argument): Renamed from no_argument to avoid
        losing due to namespace pollution in GNU getopt.h

From-SVN: r22364
This commit is contained in:
Jeffrey A Law 1998-09-09 20:24:25 +00:00 committed by Jeff Law
parent 430c3d7b01
commit 71d05349ab
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/java/ChangeLog
View File

@ -1,3 +1,8 @@
Wed Sep 9 21:23:10 1998 Jeffrey A Law (law@cygnus.com)
* gjavah.c (java_no_argument): Renamed from no_argument to avoid
losing due to namespace pollution in GNU getopt.h
Wed Sep 9 13:33:39 1998 Tom Tromey <tromey@cygnus.com> Wed Sep 9 13:33:39 1998 Tom Tromey <tromey@cygnus.com>
* Make-lang.in (java.all.build): Don't mention jvgenmain or gcjh. * Make-lang.in (java.all.build): Don't mention jvgenmain or gcjh.

18
gcc/java/gjavah.c
View File

@ -749,7 +749,7 @@ help ()
} }
static void static void
no_argument (opt) java_no_argument (opt)
char *opt; char *opt;
{ {
fprintf (stderr, "gjavah: no argument given for option `%s'\n", opt); fprintf (stderr, "gjavah: no argument given for option `%s'\n", opt);
@ -793,21 +793,21 @@ DEFUN(main, (argc, argv),
if (argi + 1 < argc) if (argi + 1 < argc)
output_file = argv[++argi]; output_file = argv[++argi];
else else
no_argument (argv[argi]); java_no_argument (argv[argi]);
} }
else if (strcmp (arg, "-d") == 0) else if (strcmp (arg, "-d") == 0)
{ {
if (argi + 1 < argc) if (argi + 1 < argc)
output_directory = argv[++argi]; output_directory = argv[++argi];
else else
no_argument (argv[argi]); java_no_argument (argv[argi]);
} }
else if (strcmp (arg, "-td") == 0) else if (strcmp (arg, "-td") == 0)
{ {
if (argi + 1 < argc) if (argi + 1 < argc)
temp_directory = argv[++argi]; temp_directory = argv[++argi];
else else
no_argument (argv[argi]); java_no_argument (argv[argi]);
} }
else if (strcmp (arg, "-prepend") == 0) else if (strcmp (arg, "-prepend") == 0)
{ {
@ -818,7 +818,7 @@ DEFUN(main, (argc, argv),
prepend_specs[prepend_count++] = argv[++argi]; prepend_specs[prepend_count++] = argv[++argi];
} }
else else
no_argument (argv[argi]); java_no_argument (argv[argi]);
} }
else if (strcmp (arg, "-friend") == 0) else if (strcmp (arg, "-friend") == 0)
{ {
@ -829,7 +829,7 @@ DEFUN(main, (argc, argv),
friend_specs[friend_count++] = argv[++argi]; friend_specs[friend_count++] = argv[++argi];
} }
else else
no_argument (argv[argi]); java_no_argument (argv[argi]);
} }
else if (strcmp (arg, "-add") == 0) else if (strcmp (arg, "-add") == 0)
{ {
@ -840,7 +840,7 @@ DEFUN(main, (argc, argv),
add_specs[add_count++] = argv[++argi]; add_specs[add_count++] = argv[++argi];
} }
else else
no_argument (argv[argi]); java_no_argument (argv[argi]);
} }
else if (strcmp (arg, "-append") == 0) else if (strcmp (arg, "-append") == 0)
{ {
@ -851,14 +851,14 @@ DEFUN(main, (argc, argv),
append_specs[append_count++] = argv[++argi]; append_specs[append_count++] = argv[++argi];
} }
else else
no_argument (argv[argi]); java_no_argument (argv[argi]);
} }
else if (strcmp (arg, "-classpath") == 0) else if (strcmp (arg, "-classpath") == 0)
{ {
if (argi + 1 < argc) if (argi + 1 < argc)
classpath = argv[++argi]; classpath = argv[++argi];
else else
no_argument (argv[argi]); java_no_argument (argv[argi]);
} }
else if (strcmp (arg, "-verbose") == 0 || strcmp (arg, "-v") == 0) else if (strcmp (arg, "-verbose") == 0 || strcmp (arg, "-v") == 0)
verbose++; verbose++;