merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index d60b634c05364ce2b164d2145ba0bb228dbc138e..fa03f7cd7fa982a078ae18ab5199842da4b47b03 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-13  Aaron W. LaFramboise  <aaronavay62@aaronwl.com>
+
+       * libiberty.h (basename): Prototype for __MINGW32__.
+
 2004-09-13  Paul Brook  <paul@codesourcery.com>
 
        * elf/arm.h: Rename RELABS to TARGET1.

diff --git a/include/libiberty.h b/include/libiberty.h
index 4aab80b215073badfdca76677700afe737d229a6..c9f480aaf6955def94cbe97fe625a06cbbfe6d76 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -74,7 +74,7 @@ extern char **dupargv PARAMS ((char **)) ATTRIBUTE_MALLOC;
    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 !HAVE_DECL_BASENAME
-#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (HAVE_DECL_BASENAME)
+#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME)
 extern char *basename PARAMS ((const char *));
 #else
 extern char *basename ();