X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdb_string.h;h=4ccb500bba5fefcff90d1def6c044f94d121e9d9;hb=a3828db05a4f4b107b8ab4210f5f7e882786a365;hp=944eec14ad9c67b648c148f45c4142523d69fdee;hpb=e98fe4f7b54cbdf29aef9287bbb1bea8801dd05a;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/gdb_string.h b/gdb/gdb_string.h
index 944eec14ad..4ccb500bba 100644
--- a/gdb/gdb_string.h
+++ b/gdb/gdb_string.h
@@ -1,21 +1,24 @@
 /* Portable <string.h>
-   Copyright 1995, 1998 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   Copyright 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., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #if !defined(GDB_STRING_H)
 #define GDB_STRING_H
@@ -23,46 +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
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
 
 #ifndef strchr
-extern char *strchr PARAMS ((const char *, int));	/* X3.159-1989  4.11.5.2 */
+extern char *strchr (const char *, int);	/* X3.159-1989  4.11.5.2 */
 #endif
 
 #ifndef strrchr
-extern char *strrchr PARAMS ((const char *, int));	/* X3.159-1989  4.11.5.5 */
-#endif
-
-#ifndef strstr
-extern char *strstr PARAMS ((const char *, const char *));	/* X3.159-1989  4.11.5.7 */
+extern char *strrchr (const char *, int);	/* X3.159-1989  4.11.5.5 */
 #endif
 
 #ifndef strtok
-extern char *strtok PARAMS ((char *, const char *));	/* X3.159-1989  4.11.5.8 */
+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
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#else
+extern void *memset ();
+extern void *memcpy ();
+extern void *memmove ();
+extern int memcmp ();
+#endif
 #endif /* STDC_HEADERS */
 
-#ifdef NEED_DECLARATION_STRERROR
+#if !HAVE_DECL_STRERROR
 #ifndef strerror
-extern char *strerror PARAMS ((int));	/* X3.159-1989  4.11.6.2 */
+extern char *strerror (int);	/* X3.159-1989  4.11.6.2 */
 #endif
 #endif
 
-#ifdef NEED_DECLARATION_STRDUP
-extern char *strdup (); /* full prototype collides w/ some OSes (AIX 3.2.5) */
+#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) */
+#endif /* !defined(GDB_STRING_H) */