gjavah.c (java_no_argument): Renamed from no_argument to avoid losing due to namespac...

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

From-SVN: r22364

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a51ccbfdba4ea9409f594a0c45361cf40990883a..bad5a4e6d3dbeeea8561163882800b672e96619e 100644 (file)
--- 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 29b3cc12835e3c40ecc584c7c93f3bf4c7b04eba..fd39df6b8fcf506b44618d1801db37969e3a2a49 100644 (file)
--- 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++;