[svn] Unconditionally include locale.h.

diff --git a/ChangeLog b/ChangeLog
index 9dbae27c6f37f45ff83253630b48f9209d4009fb..aea73d91e1ffcd5816a309722e1d7c28ccc0b3fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-29  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * m4/wget.m4 (WGET_WITH_NLS): Don't check for locale.h.
+
 2005-06-29  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * configure.in: Test for $LIBSSL instead of the old $ssl_success

diff --git a/m4/wget.m4 b/m4/wget.m4
index c115de7516368db188fd37f152d725a90420d9ae..86ced408bcea2e328926aec22135467ad361f54c 100644 (file)
--- a/m4/wget.m4
+++ b/m4/wget.m4
@@ -279,7 +279,7 @@ AC_DEFUN([WGET_WITH_NLS],
        fi
       fi
 
-      AC_CHECK_HEADERS(locale.h libintl.h)
+      AC_CHECK_HEADERS(libintl.h)
 
       dnl Prefer gettext found in -lintl to the one in libc.
       dnl Otherwise it can happen that we include libintl.h from

diff --git a/src/ChangeLog b/src/ChangeLog
index 7e1617c83ad956f59512520646cb592cee15eb58..bbe364c64e4a2e3ba77e939bf19c85c39b11d7f8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-29  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * utils.c: Unconditionally include locale.h.
+
 2005-06-29  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * ptimer.c: Include sys/time.h to get struct timeval.

diff --git a/src/main.c b/src/main.c
index ecbd88083836ddec0639422850256f69c11d82cc..d05292a7c5e84d8218b906092c05bdbdee3f444c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -36,7 +36,7 @@ so, delete this exception statement from your version.  */
 #endif /* HAVE_UNISTD_H */
 #include <string.h>
 #include <signal.h>
-#if defined(HAVE_NLS) && defined(HAVE_LOCALE_H)
+#ifdef HAVE_NLS
 # include <locale.h>
 #endif
 #include <assert.h>

diff --git a/src/utils.c b/src/utils.c
index d785f1ba9f217baab15f183a21fbeec03b6ad50a..a88d129054f9726491857d61bd814a1c18640bba 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -58,9 +58,7 @@ so, delete this exception statement from your version.  */
 #include <fcntl.h>
 #include <assert.h>
 #include <stdarg.h>
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
+#include <locale.h>
 
 /* For TIOCGWINSZ and friends: */
 #ifdef HAVE_SYS_IOCTL_H