X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdb_string.h;h=42fa7dabeb0be4d07220af778040c17374a47897;hb=0963b4bd458eab010b3b19c9ffd8eb790f2cd06c;hp=0c6b68af0345f2f173e6805840ffddeb102854fb;hpb=b607efe7149f91512dc5fd9dbfc4c6156cdf9a93;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/gdb_string.h b/gdb/gdb_string.h
index 0c6b68af03..42fa7dabeb 100644
--- a/gdb/gdb_string.h
+++ b/gdb/gdb_string.h
@@ -1,64 +1,70 @@
 /* Portable <string.h>
-   Copyright 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   Copyright (C) 1995, 1998, 1999, 2000, 2001, 2004, 2007, 2008, 2009, 2010,
+   2011 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 3 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, see <http://www.gnu.org/licenses/>.  */
 
 #if !defined(GDB_STRING_H)
 #define GDB_STRING_H
 
 #ifdef STDC_HEADERS
 #include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h> /* strcasecmp etc..  */
+#endif
+#else
+#ifdef HAVE_STRING_H
+#include <string.h>
 #else
-# ifdef HAVE_STRING_H
-#   include <string.h>
-# else
-#   include <strings.h>
-# endif
+#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 */
+extern char *strrchr (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 */
+#ifndef strtok
+extern char *strtok (char *, const char *);	/* X3.159-1989  4.11.5.8 */
 #endif
 
-#ifndef strtok
-extern char *strtok PARAMS ((char *, const char *));	/* X3.159-1989  4.11.5.8 */
+#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 PARAMS ((int));	/* X3.159-1989  4.11.6.2 */
+extern char *strerror (int);	/* X3.159-1989  4.11.6.2 */
 #endif
-
-# 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 ();
+#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) */