merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 13dccfd0adf3066e0b9c4b26b2cf7134fd40e4f3..f7097c968b3b22a9291450531192d03157e6b77f 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-12  Steve Ellcey  <sje@cup.hp.com>
+
+       libiberty.h: Do not define empty basename prototype.
+
 2005-05-10  Nick Clifton  <nickc@redhat.com>
 
        * Update the address and phone number of the FSF organization in

diff --git a/include/libiberty.h b/include/libiberty.h
index 3f51e41312d1a111e4540537a20468f147a45e82..ae0ab2bde08ac45fd98d46425e29742d98741a62 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -97,7 +97,10 @@ extern char **dupargv (char **) ATTRIBUTE_MALLOC;
 #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 (const char *);
 #else
-extern char *basename ();
+/* Do not allow basename to be used if there is no prototype seen.  We
+   either need to use the above prototype or have one from
+   autoconf which would result in HAVE_DECL_BASENAME being set.  */
+#define basename basename_cannot_be_used_without_a_prototype
 #endif
 #endif