From 49e472308614968a6291bd862fcaa01be063d8fe Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Mon, 31 Jul 2006 16:09:08 +0000
Subject: [PATCH] Assume the standard headers exist.

---
 lib/ChangeLog      |  4 ++++
 lib/localcharset.c | 15 +++------------
 m4/ChangeLog       |  5 +++++
 m4/localcharset.m4 |  3 +--
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 091ee115f5..130a1ecd51 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-29  Bruno Haible  <bruno@clisp.org>
+
+	* localcharset.c: Assume <stddef.h>, <stdlib.h>, <string.h> exist.
+
 2006-07-29  Bruno Haible  <bruno@clisp.org>
 
 	* setenv.c: Undo unintended modification done on 2006-02-27.
diff --git a/lib/localcharset.c b/lib/localcharset.c
index 08daf7353a..cd44ca658c 100644
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -25,19 +25,10 @@
 /* Specification.  */
 #include "localcharset.h"
 
-#if HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-
+#include <stddef.h>
 #include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <string.h>
+#include <stdlib.h>
 
 #if defined _WIN32 || defined __WIN32__
 # define WIN32_NATIVE
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 2a79891668..1c706da31a 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-31  Bruno Haible  <bruno@clisp.org>
+
+	* localcharset.m4 (gl_LOCALCHARSET): Remove tests for <stddef.h>,
+	<stdlib.h>, <string.h>.
+
 2006-07-30  Bruno Haible  <bruno@clisp.org>
 
 	* wcwidth.m4 (gl_FUNC_WCWIDTH): Assume <string.h> exists.
diff --git a/m4/localcharset.m4 b/m4/localcharset.m4
index 6863d32253..c0396356ce 100644
--- a/m4/localcharset.m4
+++ b/m4/localcharset.m4
@@ -1,4 +1,4 @@
-# localcharset.m4 serial 3
+# localcharset.m4 serial 4
 dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_LOCALCHARSET],
 [
   dnl Prerequisites of lib/localcharset.c.
-  AC_CHECK_HEADERS_ONCE(stddef.h stdlib.h string.h)
   AC_REQUIRE([AM_LANGINFO_CODESET])
   AC_CHECK_DECLS_ONCE(getc_unlocked)
   AC_CHECK_FUNCS_ONCE(setlocale)
-- 
2.30.2