Work around the __VA_LIST__ in <wchar.h> problem on Tru64 with DTK compiler.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index f16924a..1634c4f 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-11  Bruno Haible  <bruno@clisp.org>
+
+       * wcwidth.m4 (gl_FUNC_WCWIDTH): Include <stdio.h> and <time.h> before
+       <wchar.h>. Needed for OSF/1 and BSD/OS.
+
 2006-08-10  Jim Meyering  <jim@meyering.net>
 
        * cycle-check.m4: New file.

diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index 06a12a1..8cdfba4 100644 (file)
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 4
+# wcwidth.m4 serial 5
 dnl Copyright (C) 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,
@@ -19,6 +19,12 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
 /* AIX 3.2.5 declares wcwidth in <string.h>. */
 #include <string.h>
 #if HAVE_WCHAR_H
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
+   <wchar.h>.  */
+# include <stdio.h>
+# include <time.h>
 # include <wchar.h>
 #endif
 ])])