From: Bruno Haible <bruno@clisp.org>
Date: Fri, 12 Jan 2007 16:07:05 +0000 (+0000)
Subject: Update from gnulib.
X-Git-Tag: v0.17~512
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96653699f028aa557815bee8ce9c402be29cd001;p=thirdparty%2Fgettext.git

Update from gnulib.
---

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 8685d51b6..99958ad54 100644
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,6 +1,12 @@
+2007-01-10  Eric Blake  <ebb9@byu.net>
+
+	* wint_t.m4 (gt_TYPE_WINT_T): Include <stddef.h> before <wchar.h>, to
+	work around BSDI bug in BSD/OS 4.0.1.
+	Reported by Chris McGuire.
+
 2006-11-21  Bruno Haible  <bruno@clisp.org>
 
-	* m4/size_max.m4 (gl_SIZE_MAX): Use AC_COMPUTE_INT instead of
+	* size_max.m4 (gl_SIZE_MAX): Use AC_COMPUTE_INT instead of
 	_AC_COMPUTE_INT.
 	(AC_COMPUTE_INT): Add fallback definition for autoconf < 2.61.
 
diff --git a/gettext-runtime/m4/wint_t.m4 b/gettext-runtime/m4/wint_t.m4
index b8fff9c86..2cac1a710 100644
--- a/gettext-runtime/m4/wint_t.m4
+++ b/gettext-runtime/m4/wint_t.m4
@@ -1,5 +1,5 @@
-# wint_t.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+# wint_t.m4 serial 2 (gettext-0.16.2)
+dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,15 @@ dnl Prerequisite: AC_PROG_CC
 AC_DEFUN([gt_TYPE_WINT_T],
 [
   AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
-    [AC_TRY_COMPILE([#include <wchar.h>
+    [AC_TRY_COMPILE([
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
        wint_t foo = (wchar_t)'\0';], ,
        gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
   if test $gt_cv_c_wint_t = yes; then