2012-02-21 Pedro Alves <palves@redhat.com>

[deliverable/binutils-gdb.git] / gdb / gdb_string.h

diff --git a/gdb/gdb_string.h b/gdb/gdb_string.h
index 9824f1f8c92c679a09d3f9d29647eb4ecac2c1d1..aa037dffcf9108627b47ef33ce8a793a0d669749 100644 (file)
--- a/gdb/gdb_string.h
+++ b/gdb/gdb_string.h
@@ -1,11 +1,13 @@
 /* Portable <string.h>
-   Copyright 1995, 1998 Free Software Foundation, Inc.
+
+   Copyright (C) 1995, 1998-2001, 2004, 2007-2012 Free Software
+   Foundation, Inc.
 
    This file is part of GDB.
 
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,15 +16,16 @@
    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.  */
+   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>
@@ -31,15 +34,15 @@
 #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 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
@@ -52,19 +55,15 @@ 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) */
-#endif
-
-#ifdef NEED_DECLARATION_STRSTR
+#if !HAVE_DECL_STRSTR
 #ifndef strstr
-extern char *strstr PARAMS ((const char *, const char *));     /* X3.159-1989  4.11.5.7 */
+extern char *strstr (const char *, const char *); /* X3.159-1989  4.11.5.7 */
 #endif
 #endif