# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1063202875 0
# Node ID 90abbdf08583f46b2f414745b9fb598eb92ba867
# Parent  f07e06abfead4370ffc61849c1bc4c68d7dd7e59
Assume ANSI C.

diff --git a/lib/strcspn.c b/lib/strcspn.c
--- 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
--- 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
--- 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 @@
 # 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
--- 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
--- 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 @@
 ])
 
 # 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
--- 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 @@
 ])
 
 # 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
--- 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 @@
 ])
 
 # 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
--- 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 @@
 
 AC_DEFUN([gl_UNICODEIO],
 [
-  dnl Prerequisites of lib/unicodeio.c.
-  AC_CHECK_HEADERS_ONCE(string.h)
+  dnl No prerequisites of lib/unicodeio.c.
+  :
 ])