From 7dd7a67c1fc5fbf657c2ffbd03c334310d368cb0 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Wed, 10 Sep 2003 14:16:32 +0000
Subject: [PATCH] Assume ANSI C <string.h>, <stdlib.h>.

---
 lib/ChangeLog  |  9 +++++++++
 lib/setenv.c   |  8 ++------
 lib/unsetenv.c | 10 +++-------
 m4/ChangeLog   |  9 +++++++++
 m4/setenv.m4   |  8 ++++----
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 4214f47c7c..f5542b41bb 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-10  Bruno Haible  <bruno@clisp.org>
+
+	* strcspn.c: Include <string.h> unconditionally.
+	* strpbrk.c: Include <string.h> unconditionally.
+	* strstr.c: Include <string.h> unconditionally.
+	* unicodeio.c: Include <string.h> unconditionally.
+	* setenv.c: Include <stdlib.h> and <string.h> unconditionally.
+	* unsetenv.c: Likewise.
+
 2003-09-10  Jim Meyering  <jim@meyering.net>
 
 	* error.c: Correct indentation of cpp directives.
diff --git a/lib/setenv.c b/lib/setenv.c
index 04073caa03..0a28cb9fbf 100644
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -28,12 +28,8 @@ extern int errno;
 # define __set_errno(ev) ((errno) = (ev))
 #endif
 
-#if _LIBC || HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#if _LIBC || HAVE_STRING_H
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 #if _LIBC || HAVE_UNISTD_H
 # include <unistd.h>
 #endif
diff --git a/lib/unsetenv.c b/lib/unsetenv.c
index 5568919c04..b7a38ad0fe 100644
--- a/lib/unsetenv.c
+++ b/lib/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-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
@@ -27,12 +27,8 @@ extern int errno;
 # define __set_errno(ev) ((errno) = (ev))
 #endif
 
-#if _LIBC || HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#if _LIBC || HAVE_STRING_H
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 #if _LIBC || HAVE_UNISTD_H
 # include <unistd.h>
 #endif
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 70ff21f208..0cd96979b8 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-10  Bruno Haible  <bruno@clisp.org>
+
+	* strcspn.m4 (gl_PREREQ_STRCSPN): Remove <string.h> check.
+	* strpbrk.m4 (gl_PREREQ_STRPBRK): Remove <string.h> check.
+	* strstr.m4 (gl_PREREQ_STRSTR): Remove <string.h> check.
+	* unicodeio.m4 (gl_UNICODEIO): Remove <string.h> check.
+	* setenv.m4 (gl_PREREQ_SETENV, gl_PREREQ_UNSETENV): Remove
+	<stdlib.h> and <string.h> checks.
+
 2003-09-09  Paul Eggert  <eggert@twinsun.com>
 
 	* getcwd.m4 (AC_FUNC_GETCWD_NULL): Don't check for stdlib.h.
diff --git a/m4/setenv.m4 b/m4/setenv.m4
index af621ec53e..3b19a2943a 100644
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -1,5 +1,5 @@
-# setenv.m4 serial 3
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# setenv.m4 serial 4
+dnl Copyright (C) 2001-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
@@ -40,7 +40,7 @@ AC_DEFUN([gt_CHECK_VAR_DECL],
 AC_DEFUN([gl_PREREQ_SETENV],
 [
   AC_REQUIRE([AC_FUNC_ALLOCA])
-  AC_CHECK_HEADERS_ONCE(stdlib.h string.h unistd.h)
+  AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CHECK_HEADERS(search.h)
   AC_CHECK_FUNCS(tsearch)
   gt_CHECK_VAR_DECL([#include <errno.h>], errno)
@@ -50,7 +50,7 @@ AC_DEFUN([gl_PREREQ_SETENV],
 # Prerequisites of lib/unsetenv.c.
 AC_DEFUN([gl_PREREQ_UNSETENV],
 [
-  AC_CHECK_HEADERS_ONCE(stdlib.h string.h unistd.h)
+  AC_CHECK_HEADERS_ONCE(unistd.h)
   gt_CHECK_VAR_DECL([#include <errno.h>], errno)
   gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
 ])
-- 
2.30.2