diff options
| author | DJ Delorie <dj@redhat.com> | 2005-05-12 20:00:35 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2005-05-12 20:00:35 +0000 |
| commit | aaac363113ec5f611c73865a5c6231aad9b7e281 (patch) | |
| tree | 5a655341187dfdf5215a37dcf29b4265ea4c3181 | |
| parent | f1166a0987615f14706a0f859e24c7d88fe2610a (diff) | |
| download | gdb-aaac363113ec5f611c73865a5c6231aad9b7e281.zip gdb-aaac363113ec5f611c73865a5c6231aad9b7e281.tar.gz gdb-aaac363113ec5f611c73865a5c6231aad9b7e281.tar.bz2 | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/libiberty.h | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 13dccfd..f7097c9 100644 --- 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 3f51e41..ae0ab2b 100644 --- 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 |