X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fgdb_string.h;h=0a3d98e93b1354741d595435762fe15119e7f17d;hb=be85b69fc61880e3bde8d4df2bf6b4189c25d143;hp=4fb53bb519b7d5a6ea387c517183d7b089caf7ac;hpb=6c9638b444fd6ebdd189fe05c3e44dfbc95c878c;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/gdb_string.h b/gdb/gdb_string.h
index 4fb53bb519..0a3d98e93b 100644
--- a/gdb/gdb_string.h
+++ b/gdb/gdb_string.h
@@ -1,21 +1,24 @@
 /* Portable <string.h>
-   Copyright 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   Copyright (C) 1995, 1998, 1999, 2000, 2001, 2004
+   Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This file is part of GDB.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #if !defined(GDB_STRING_H)
 #define GDB_STRING_H
@@ -23,26 +26,44 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifdef STDC_HEADERS
 #include <string.h>
 #else
-# ifdef HAVE_STRING_H
-#   include <string.h>
-# else
-#   include <strings.h>
-# endif
-extern char *strchr();
-extern char *strrchr();
-extern char *strstr();
-extern char *strtok();
-extern char *strerror();
-# ifdef HAVE_MEMORY_H
-#   include <memory.h>
-# else
-extern void *memset();
-extern void *memcpy();
-extern void *memmove();
-extern int   memcmp();
-# endif
-#endif
-
-extern char *strdup();
-
-#endif	/* !defined(GDB_STRING_H) */
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
+#ifndef strchr
+extern char *strchr (const char *, int);	/* X3.159-1989  4.11.5.2 */
+#endif
+
+#ifndef strrchr
+extern char *strrchr (const char *, int);	/* X3.159-1989  4.11.5.5 */
+#endif
+
+#ifndef strtok
+extern char *strtok (char *, const char *);	/* X3.159-1989  4.11.5.8 */
+#endif
+
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#else
+extern void *memset ();
+extern void *memcpy ();
+extern void *memmove ();
+extern int memcmp ();
+#endif
+#endif /* STDC_HEADERS */
+
+#if !HAVE_DECL_STRERROR
+#ifndef strerror
+extern char *strerror (int);	/* X3.159-1989  4.11.6.2 */
+#endif
+#endif
+
+#if !HAVE_DECL_STRSTR
+#ifndef strstr
+extern char *strstr (const char *, const char *); /* X3.159-1989  4.11.5.7 */
+#endif
+#endif
+
+#endif /* !defined(GDB_STRING_H) */