wcwidth: Declare also when it's aliased.

diff --git a/ChangeLog b/ChangeLog
index 69e7f2693de97393c1ba9034aa2d5b0171bb623e..c65aaa4ba9f9e21ede4c28fe11599109f59952fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index fb4f1058dc8bf9fc0f822e46ff46824f085ccc5b..342a9d251477077b04810d6a950bd0c26c6ecec9 100644 (file)
--- 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