merge from gcc

This commit is contained in:
DJ Delorie 2005-05-12 20:00:35 +00:00
parent cda9ed9077
commit 58fc7cdaf9
2 changed files with 8 additions and 1 deletions

View File

@ -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

View File

@ -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