Assume ANSI C.

diff --git a/lib/strcspn.c b/lib/strcspn.c
index 2bbd906..33a6628 100644 (file)
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1996-1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
@@ -23,15 +23,7 @@
 #endif
 
 #include <stddef.h>
-
-#if defined _LIBC || HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
+#include <string.h>
 
 #undef strcspn
 

diff --git a/lib/strpbrk.c b/lib/strpbrk.c
index 01d8df5..ce43996 100644 (file)
--- a/lib/strpbrk.c
+++ b/lib/strpbrk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 2000, 2002-2003 Free Software Foundation, Inc.
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
@@ -21,10 +21,7 @@
 #endif
 
 #include <stddef.h>
-
-#if defined _LIBC || HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 
 #undef strpbrk
 

diff --git a/lib/strstr.c b/lib/strstr.c
index 42ffcfa..dd46222 100644 (file)
--- a/lib/strstr.c
+++ b/lib/strstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1999, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1999, 2002-2003 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 This program is free software; you can redistribute it and/or modify
@@ -28,9 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif
 
-#if defined _LIBC || defined HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 
 typedef unsigned chartype;
 

diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 7b7f6f2..4f0792b 100644 (file)
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -29,11 +29,7 @@
 #include "unicodeio.h"
 
 #include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
 
 #include <errno.h>
 #ifndef errno

diff --git a/m4/strcspn.m4 b/m4/strcspn.m4
index 1fb5f14..b450ffb 100644 (file)
--- a/m4/strcspn.m4
+++ b/m4/strcspn.m4
@@ -1,5 +1,5 @@
-# strcspn.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strcspn.m4 serial 2
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -15,6 +15,4 @@ AC_DEFUN([gl_FUNC_STRCSPN],
 ])
 
 # Prerequisites of lib/strcspn.c.
-AC_DEFUN([gl_PREREQ_STRCSPN], [
-  AC_CHECK_HEADERS_ONCE(string.h)
-])
+AC_DEFUN([gl_PREREQ_STRCSPN], [:])

diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4
index 1f5fa01..01425c4 100644 (file)
--- a/m4/strpbrk.m4
+++ b/m4/strpbrk.m4
@@ -1,5 +1,5 @@
-# strpbrk.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strpbrk.m4 serial 2
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -15,6 +15,4 @@ AC_DEFUN([gl_FUNC_STRPBRK],
 ])
 
 # Prerequisites of lib/strpbrk.c.
-AC_DEFUN([gl_PREREQ_STRPBRK], [
-  AC_CHECK_HEADERS_ONCE(string.h)
-])
+AC_DEFUN([gl_PREREQ_STRPBRK], [:])

diff --git a/m4/strstr.m4 b/m4/strstr.m4
index 25a1801..20c2c0a 100644 (file)
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -1,5 +1,5 @@
-# strstr.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strstr.m4 serial 2
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -15,6 +15,4 @@ AC_DEFUN([gl_FUNC_STRSTR],
 ])
 
 # Prerequisites of lib/strstr.c.
-AC_DEFUN([gl_PREREQ_STRSTR], [
-  AC_CHECK_HEADERS_ONCE(string.h)
-])
+AC_DEFUN([gl_PREREQ_STRSTR], [:])

diff --git a/m4/unicodeio.m4 b/m4/unicodeio.m4
index 8ff756c..3e7ea78 100644 (file)
--- a/m4/unicodeio.m4
+++ b/m4/unicodeio.m4
@@ -1,5 +1,5 @@
-# unicodeio.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# unicodeio.m4 serial 2
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -8,6 +8,6 @@ dnl the same distribution terms as the rest of that program.
 
 AC_DEFUN([gl_UNICODEIO],
 [
-  dnl Prerequisites of lib/unicodeio.c.
-  AC_CHECK_HEADERS_ONCE(string.h)
+  dnl No prerequisites of lib/unicodeio.c.
+  :
 ])