Assume the standard headers exist.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 091ee115f50d37b9274c32bcaf9a65d7ea735097..130a1ecd51a571b5175f70ace431b55148b9b87f 100644 (file)
--- 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 08daf7353a2e23431da0cc94149ccb4d125ab5ec..cd44ca658c9451f3f6638f9d039388a198a35802 100644 (file)
--- 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 2a79891668194611f151574746e96341132fd74a..1c706da31a8c762ae53e257f52401e13de8a09ec 100644 (file)
--- 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 6863d322535fe8c3df63d76dd9605c626d3be4a7..c0396356ceb7c96a9d7ad2a14117815d58eb7961 100644 (file)
--- 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)