diff options
| author | DJ Delorie <dj@redhat.com> | 2004-09-14 01:16:22 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2004-09-14 01:16:22 +0000 |
| commit | 2f514b3252441d4d7a36a546b3882fce75b102a1 (patch) | |
| tree | fac36afb968ec01980e41cd56c40e0e758da743e | |
| parent | d4c8e53b22246384fe8f9d259e5cc0f28c660c40 (diff) | |
| download | cygnal-2f514b3252441d4d7a36a546b3882fce75b102a1.tar.gz cygnal-2f514b3252441d4d7a36a546b3882fce75b102a1.tar.bz2 cygnal-2f514b3252441d4d7a36a546b3882fce75b102a1.zip | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/libiberty.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index d60b634c0..fa03f7cd7 100644 --- 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 4aab80b21..c9f480aaf 100644 --- 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 (); |