diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-09-09 20:24:25 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-09-09 20:24:25 +0000 |
| commit | f896a85ae29762825e5a1de2f46667f2ab69aa9c (patch) | |
| tree | 3c42fa31c0d4bd411434129b2e84178748e6600b | |
| parent | 1666cb45b97eefefcda5145f838be1a4bbcd505f (diff) | |
| download | gcc-f896a85ae29762825e5a1de2f46667f2ab69aa9c.tar.gz | |
* gjavah.c (java_no_argument): Renamed from no_argument to avoid
losing due to namespace pollution in GNU getopt.h
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@22364 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/gjavah.c | 18 |
2 files changed, 14 insertions, 9 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index a51ccbfdba4..bad5a4e6d3d 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -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> * Make-lang.in (java.all.build): Don't mention jvgenmain or gcjh. diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c index 29b3cc12835..fd39df6b8fc 100644 --- a/gcc/java/gjavah.c +++ b/gcc/java/gjavah.c @@ -749,7 +749,7 @@ help () } static void -no_argument (opt) +java_no_argument (opt) char *opt; { fprintf (stderr, "gjavah: no argument given for option `%s'\n", opt); @@ -793,21 +793,21 @@ DEFUN(main, (argc, argv), if (argi + 1 < argc) output_file = argv[++argi]; else - no_argument (argv[argi]); + java_no_argument (argv[argi]); } else if (strcmp (arg, "-d") == 0) { if (argi + 1 < argc) output_directory = argv[++argi]; else - no_argument (argv[argi]); + java_no_argument (argv[argi]); } else if (strcmp (arg, "-td") == 0) { if (argi + 1 < argc) temp_directory = argv[++argi]; else - no_argument (argv[argi]); + java_no_argument (argv[argi]); } else if (strcmp (arg, "-prepend") == 0) { @@ -818,7 +818,7 @@ DEFUN(main, (argc, argv), prepend_specs[prepend_count++] = argv[++argi]; } else - no_argument (argv[argi]); + java_no_argument (argv[argi]); } else if (strcmp (arg, "-friend") == 0) { @@ -829,7 +829,7 @@ DEFUN(main, (argc, argv), friend_specs[friend_count++] = argv[++argi]; } else - no_argument (argv[argi]); + java_no_argument (argv[argi]); } else if (strcmp (arg, "-add") == 0) { @@ -840,7 +840,7 @@ DEFUN(main, (argc, argv), add_specs[add_count++] = argv[++argi]; } else - no_argument (argv[argi]); + java_no_argument (argv[argi]); } else if (strcmp (arg, "-append") == 0) { @@ -851,14 +851,14 @@ DEFUN(main, (argc, argv), append_specs[append_count++] = argv[++argi]; } else - no_argument (argv[argi]); + java_no_argument (argv[argi]); } else if (strcmp (arg, "-classpath") == 0) { if (argi + 1 < argc) classpath = argv[++argi]; else - no_argument (argv[argi]); + java_no_argument (argv[argi]); } else if (strcmp (arg, "-verbose") == 0 || strcmp (arg, "-v") == 0) verbose++; |