2006-09-05 Bibo Mao <bibo.mao@intel.com>

[deliverable/binutils-gdb.git] / bfd / sysdep.h

diff --git a/bfd/sysdep.h b/bfd/sysdep.h
index d9469ef0b937418c57153236aa261e4723d825ae..f6313d3905ce5a910dc2f8fb7ba945c450a52b3a 100644 (file)
--- a/bfd/sysdep.h
+++ b/bfd/sysdep.h
@@ -39,6 +39,10 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 extern int errno;
 #endif
 
+#ifdef STRING_WITH_STRINGS
+#include <string.h>
+#include <strings.h>
+#else
 #ifdef HAVE_STRING_H
 #include <string.h>
 #else
@@ -49,6 +53,7 @@ extern char *strchr ();
 extern char *strrchr ();
 #endif
 #endif
+#endif
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -126,9 +131,7 @@ extern PTR realloc ();
 #endif
 
 #if !HAVE_DECL_STPCPY
-/* With glibc, not exposed without -D__USE_GNU, but some old versions
-   (2.2.5-34 on RH 7.3) still expose the macro.  */
-extern char *(stpcpy) (char *__dest, const char *__src);
+extern char *stpcpy (char *__dest, const char *__src);
 #endif
 
 #if !HAVE_DECL_STRSTR