summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2004-03-23 17:18:37 +0000
committerJim Meyering <jim@meyering.net>2004-03-23 17:18:37 +0000
commit806490628c6ce4c23adff5b93e98ea1e8306b056 (patch)
treec279e994f0c639fc65f3b8aa27d62bfed340e711 /lib
parent9715a5bebf370e6a6b5b4eb4a83c4916f72ee984 (diff)
downloadcoreutils-806490628c6ce4c23adff5b93e98ea1e8306b056.tar.xz
Sync from gnulib.
* mbswidth.h: Include <wchar.h> only if HAVE_DECL_MBSWIDTH_IN_WCHAR_H, not on all platforms that have <wchar.h>.
Diffstat (limited to 'lib')
-rw-r--r--lib/mbswidth.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index cd41c9f20..6fec3f490 100644
--- a/lib/mbswidth.h
+++ b/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