merge from gcc
This commit is contained in:
parent
d4c8e53b22
commit
2f514b3252
|
@ -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>
|
2004-09-13 Paul Brook <paul@codesourcery.com>
|
||||||
|
|
||||||
* elf/arm.h: Rename RELABS to TARGET1.
|
* elf/arm.h: Rename RELABS to TARGET1.
|
||||||
|
|
|
@ -74,7 +74,7 @@ extern char **dupargv PARAMS ((char **)) ATTRIBUTE_MALLOC;
|
||||||
to find the declaration so provide a fully prototyped one. If it
|
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. */
|
is 1, we found it so don't provide any declaration at all. */
|
||||||
#if !HAVE_DECL_BASENAME
|
#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 *));
|
extern char *basename PARAMS ((const char *));
|
||||||
#else
|
#else
|
||||||
extern char *basename ();
|
extern char *basename ();
|
||||||
|
|
Loading…
Reference in New Issue