From: Bruno Haible <bruno@clisp.org>
Date: Sun, 2 May 2010 21:03:16 +0000 (+0200)
Subject: wcwidth: Declare also when it's aliased.
X-Git-Tag: v0.1~4186
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=28f3679a51f29cdaa8cb6c8211fa6ecaad3a852c;p=gnulib.git

wcwidth: Declare also when it's aliased.
---

diff --git a/ChangeLog b/ChangeLog
index 69e7f2693..c65aaa4ba 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 fb4f1058d..342a9d251 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