summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2010-05-02 23:03:16 +0200
committerBruno Haible <bruno@clisp.org>2010-05-02 23:03:16 +0200
commit28f3679a51f29cdaa8cb6c8211fa6ecaad3a852c (patch)
tree06901c5f657049065d444f56889a04ec0419481b
parent8d15ad7d119f863f395126fda5cbf55be411ea0c (diff)
downloadgnulib-28f3679a51f29cdaa8cb6c8211fa6ecaad3a852c.tar.gz
wcwidth: Declare also when it's aliased.
-rw-r--r--ChangeLog6
-rw-r--r--lib/wchar.in.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 69e7f2693d..c65aaa4ba9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-05-02 Bruno Haible <bruno@clisp.org>
+ wcwidth: Declare also when it's aliased.
+ * lib/wchar.in.h (wcwidth): Don't test whether wcwidth is defined as a
+ macro.
+
+2010-05-02 Bruno Haible <bruno@clisp.org>
+
Fix regression from 2010-04-25.
* gnulib-tool (func_modules_transitive_closure): Check the status of
all modules, not only of the tests that are of the form foo-tests where
diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index fb4f1058dc..342a9d2514 100644
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -407,7 +407,7 @@ _GL_WARN_ON_USE (wcsnrtombs, "wcsnrtombs is unportable - "
_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t));
_GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
# else
-# if !defined wcwidth && !@HAVE_DECL_WCWIDTH@
+# if !@HAVE_DECL_WCWIDTH@
/* wcwidth exists but is not declared. */
_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t));
# endif