merge from gcc
This commit is contained in:
parent
03e3cf9846
commit
ee9b1ceb2d
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue