merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 038ab460b007fb67a9aa9a6285f28caedfff6c0c..05a3981116f7f07222836cb0fb972ff4f163cae4 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-24  Alan Modra  <amodra@bigpond.net.au>
+
+       * libiberty.h (basename): Don't declare if HAVE_DECL_BASENAME.
+       * getopt.h (getopt): Don't declare if HAVE_DECL_GETOPT.
+
 2002-06-18  Dave Brolley  <brolley@redhat.com>
 
        From Catherine Moore:

diff --git a/include/getopt.h b/include/getopt.h
index cb5feba1160ca068ed985916914cc49be0299b4c..0c6470b3ddb9f1e12d1dff146b0a4b47bcb5818f 100644 (file)
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -105,16 +105,17 @@ struct option
    declaration without arguments.  If it is 0, we checked and failed
    to find the declaration so provide a fully prototyped one.  If it
    is 1, we found it so don't provide any declaration at all.  */
-#if defined (__GNU_LIBRARY__) || (defined (HAVE_DECL_GETOPT) && !HAVE_DECL_GETOPT)
+#if !HAVE_DECL_GETOPT
+#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT)
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */
 extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
-# if !defined (HAVE_DECL_GETOPT)
+#else
 extern int getopt ();
-# endif
-#endif /* __GNU_LIBRARY__ */
+#endif
+#endif /* !HAVE_DECL_GETOPT */
+
 extern int getopt_long (int argc, char *const *argv, const char *shortopts,
                        const struct option *longopts, int *longind);
 extern int getopt_long_only (int argc, char *const *argv,

diff --git a/include/libiberty.h b/include/libiberty.h
index 3e0ca096c02800f7f696d76543fafde61ad8d257..0463301832e92dcf5b4ac20f4f638a71c3232306 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -73,12 +73,12 @@ extern char **dupargv PARAMS ((char **)) ATTRIBUTE_MALLOC;
    declaration without arguments.  If it is 0, we checked and failed
    to find the declaration so provide a fully prototyped one.  If it
    is 1, we found it so don't provide any declaration at all.  */
-#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || (defined (HAVE_DECL_BASENAME) && !HAVE_DECL_BASENAME)
+#if !HAVE_DECL_BASENAME
+#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (HAVE_DECL_BASENAME)
 extern char *basename PARAMS ((const char *));
 #else
-# if !defined (HAVE_DECL_BASENAME)
 extern char *basename ();
-# endif
+#endif
 #endif
 
 /* A well-defined basename () that is always compiled in.  */