From 9361c1b1e716a5168a525daddd318695dbfe4b53 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Mon, 19 Apr 2004 11:53:56 +0000
Subject: Update from gnulib.

---
 gettext-tools/lib/ChangeLog  |  7 +++++++
 gettext-tools/lib/mbswidth.c |  8 +++++++-
 gettext-tools/lib/mbswidth.h | 11 ++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'gettext-tools/lib')

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 522f60a..84db04e 100644
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-18  Paul Eggert  <eggert@twinsun.com>
+            Bruno Haible  <bruno@clisp.org>
+
+	* mbswidth.h: Include <wchar.h> only if HAVE_DECL_MBSWIDTH_IN_WCHAR_H,
+	not on all platforms that have <wchar.h>.
+	* mbswidth.c: Include <stdio.h> and <time.h> before <wchar.h>.
+
 2004-03-19  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am (install-exec-clean): Don't remove libgettextlib.a on
diff --git a/gettext-tools/lib/mbswidth.c b/gettext-tools/lib/mbswidth.c
index c6f91db..6b9d4b3 100644
--- a/gettext-tools/lib/mbswidth.c
+++ b/gettext-tools/lib/mbswidth.c
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 2000-2004 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
@@ -34,6 +34,12 @@
 
 /* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth().  */
 #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
 
diff --git a/gettext-tools/lib/mbswidth.h b/gettext-tools/lib/mbswidth.h
index cd41c9f..6fec3f4 100644
--- a/gettext-tools/lib/mbswidth.h
+++ b/gettext-tools/lib/mbswidth.h
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-2004 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,8 +19,13 @@
 
 /* Avoid a clash of our mbswidth() with a function of the same name defined
    in UnixWare 7.1.1 <wchar.h>.  We need this #include before the #define
-   below.  */
-#if HAVE_WCHAR_H
+   below.
+   However, we don't want to #include <wchar.h> on all platforms because
+   - 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>.  */
+#if HAVE_DECL_MBSWIDTH_IN_WCHAR_H
 # include <wchar.h>
 #endif
 
-- 
cgit v1.1