From 92b5babed0ef62fb044a2b9b7e331b743158c304 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Tue, 19 Aug 2003 11:32:28 +0000
Subject: [PATCH] Assume <string.h> exists,

---
 lib/ChangeLog |  4 ++++
 lib/xstrdup.c | 13 ++++---------
 m4/ChangeLog  |  4 ++++
 m4/xalloc.m4  |  7 +++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 7d2a51281c..ad78dc7b5a 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-19  Bruno Haible  <bruno@clisp.org>
+
+	* xstrdup.c: Assume <string.h> exists.
+
 2003-08-18  Jim Meyering  <jim@meyering.net>
 
 	* setenv.h: Indent nested cpp directive.
diff --git a/lib/xstrdup.c b/lib/xstrdup.c
index cb1efa8c20..1182c592ac 100644
--- a/lib/xstrdup.c
+++ b/lib/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 1998, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1996, 1998, 2001, 2003 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
@@ -19,16 +19,11 @@
 # include <config.h>
 #endif
 
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#include <sys/types.h>
-
+/* Specification.  */
 #include "xalloc.h"
 
+#include <string.h>
+
 /* Return a newly allocated copy of STRING.  */
 
 char *
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 2fcbade8b3..30b315aa54 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-19  Bruno Haible  <bruno@clisp.org>
+
+	* xalloc.m4 (gl_PREREQ_XSTRDUP): Don't check for <string.h> any more.
+
 2003-08-17  Simon Josefsson  <jas@extundo.com>
 
 	* argp.m4: New file.
diff --git a/m4/xalloc.m4 b/m4/xalloc.m4
index 1826bdcc72..5dcb730539 100644
--- a/m4/xalloc.m4
+++ b/m4/xalloc.m4
@@ -1,5 +1,5 @@
-# xalloc.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# xalloc.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
@@ -21,6 +21,5 @@ AC_DEFUN([gl_PREREQ_XMALLOC], [
 
 # Prerequisites of lib/xstrdup.c.
 AC_DEFUN([gl_PREREQ_XSTRDUP], [
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS_ONCE(string.h)
+  :
 ])
-- 
2.30.2