diff options
| author | DJ Delorie <dj@redhat.com> | 2014-05-22 19:01:34 +0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2014-05-22 19:01:34 +0400 |
| commit | ee9b1ceb2dd1aee9ee64d2aeee1ee6b4a26b9369 (patch) | |
| tree | 3903e6118a04d5b0729965a9b57bdbeb793a10b2 /include | |
| parent | 03e3cf9846bece4a38aa587d6864412235b8045b (diff) | |
merge from gcc
Diffstat (limited to 'include')
| -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 329bf12d6..99a306936 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2014-05-21 John Marino <gnugcc@marino.st> + + * liberty.h: Use basename function on DragonFly. + 2014-05-01 Steve Ellcey <sellcey@mips.com> * include/longlong.h: Use 'defined()' to check __mips16. diff --git a/include/libiberty.h b/include/libiberty.h index 78c42eb88..7fd07036b 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -106,7 +106,10 @@ extern int countargv (char**); 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 (__MINGW32__) || defined (HAVE_DECL_BASENAME) +#if defined (__GNU_LIBRARY__ ) || defined (__linux__) \ + || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) \ + || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) \ + || defined (__DragonFly__) || defined (HAVE_DECL_BASENAME) extern char *basename (const char *) ATTRIBUTE_RETURNS_NONNULL ATTRIBUTE_NONNULL(1); #else /* Do not allow basename to be used if there is no prototype seen. We |