Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.

16 files changed, 47 insertions, 156 deletions

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 5837d2e..dad9a5b 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,22 @@
+2001-01-07  Bruno Haible  <haible@clisp.cons.org>
+
+	Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
+	* intlh.inst.in: Likewise.
+	* libgettext.h: Likewise.
+	* gettextP.h: Likewise.
+	* bindtextdom.c: Likewise.
+	* dcigettext.c: Likewise.
+	* dgettext.c: Likewise.
+	* dngettext.c: Likewise.
+	* explodename.c: Likewise.
+	* finddomain.c: Likewise.
+	* gettext.c: Likewise.
+	* l10nflist.c: Likewise.
+	* loadmsgcat.c: Likewise.
+	* localealias.c: Likewise.
+	* ngettext.c: Likewise.
+	* textdomain.c: Likewise.
+
 2001-01-06  Bruno Haible  <haible@clisp.cons.org>
 
 	Remove catgets fallback code.
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 1d5c561..795ab48 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -19,27 +19,9 @@
 # include <config.h>
 #endif
 
-#if defined HAVE_STDDEF_H || defined _LIBC
-# include <stddef.h>
-#endif
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef _LIBC
 # include <libintl.h>
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 545a12f..71ebc35 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -53,25 +53,10 @@ extern int errno;
 # define __set_errno(val) errno = (val)
 #endif
 
-#if defined HAVE_STDDEF_H || defined _LIBC
-# include <stddef.h>
-#endif
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
+#include <stddef.h>
+#include <stdlib.h>
 
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
@@ -82,9 +67,7 @@ void free ();
 # include <unistd.h>
 #endif
 
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
+#include <locale.h>
 
 #if defined HAVE_SYS_PARAM_H || defined _LIBC
 # include <sys/param.h>
diff --git a/intl/dgettext.c b/intl/dgettext.c
index 515bf6c..11ed70a 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dgettext(3) function.
-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000, 2001 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,9 +19,7 @@
 # include <config.h>
 #endif
 
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
+#include <locale.h>
 
 #ifdef _LIBC
 # include <libintl.h>
diff --git a/intl/dngettext.c b/intl/dngettext.c
index ab29321..c9623a4 100644
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dngettext(3) function.
-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000, 2001 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,9 +19,7 @@
 # include <config.h>
 #endif
 
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
+#include <locale.h>
 
 #include "gettext.h"
 #include "gettextP.h"
diff --git a/intl/explodename.c b/intl/explodename.c
index 6253c48..c4ddcc4 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -19,15 +19,8 @@
 # include <config.h>
 #endif
 
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 
 #include "loadinfo.h"
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 967e246..a1fdf94 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -22,25 +22,8 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
diff --git a/intl/gettext.c b/intl/gettext.c
index 9f26793..50d594c 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -23,15 +23,7 @@
 # define __need_NULL
 # include <stddef.h>
 #else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>		/* Just for NULL.  */
-# else
-#  ifdef HAVE_STRING_H
-#   include <string.h>
-#  else
-#   define NULL ((void *) 0)
-#  endif
-# endif
+# include <stdlib.h>		/* Just for NULL.  */
 #endif
 
 #ifdef _LIBC
diff --git a/intl/gettextP.h b/intl/gettextP.h
index daba98a..27c04e4 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -19,9 +19,7 @@
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H
 
-#if defined HAVE_STDDEF_H || defined _LIBC
-# include <stddef.h>		/* Get size_t.  */
-#endif
+#include <stddef.h>		/* Get size_t.  */
 
 #ifdef _LIBC
 # include "../iconv/gconv_int.h"
diff --git a/intl/intlh.inst.in b/intl/intlh.inst.in
index fe8281f..dee4906 100644
--- a/intl/intlh.inst.in
+++ b/intl/intlh.inst.in
@@ -18,7 +18,7 @@
 #ifndef _LIBINTL_H
 #define _LIBINTL_H	1
 
-@INCLUDE_LOCALE_H@
+#include <locale.h>
 
 /* We define an additional symbol to signal that we use the GNU
    implementation of gettext.  */
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 2da1ba2..0ded3ce 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -26,15 +26,7 @@
 # include <config.h>
 #endif
 
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
+#include <string.h>
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
@@ -46,10 +38,7 @@
 #endif
 #include <ctype.h>
 #include <sys/types.h>
-
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #include "loadinfo.h"
 
diff --git a/intl/libgettext.h b/intl/libgettext.h
index 644d727..3834a08 100644
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@@ -31,10 +31,7 @@
 #define __USE_GNU_GETTEXT 1
 
 #include <sys/types.h>
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include <locale.h>
 
 
 #ifdef __cplusplus
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 6462daa..34f1e66 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -49,15 +49,8 @@ char *alloca ();
 # endif
 #endif
 
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
diff --git a/intl/localealias.c b/intl/localealias.c
index cdda88a..e55d0c0 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -47,25 +47,9 @@ char *alloca ();
 # endif
 #endif
 
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
+#include <stdlib.h>
 
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
+#include <string.h>
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
diff --git a/intl/ngettext.c b/intl/ngettext.c
index aeb8db7..5710007 100644
--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -23,15 +23,7 @@
 # define __need_NULL
 # include <stddef.h>
 #else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>		/* Just for NULL.  */
-# else
-#  ifdef HAVE_STRING_H
-#   include <string.h>
-#  else
-#   define NULL ((void *) 0)
-#  endif
-# endif
+# include <stdlib.h>		/* Just for NULL.  */
 #endif
 
 #include "gettext.h"
diff --git a/intl/textdomain.c b/intl/textdomain.c
index 55bb550..99650d6 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -19,18 +19,8 @@
 # include <config.h>
 #endif
 
-#if defined HAVE_STDLIB_H || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef _LIBC
 # include <libintl.h>