From 28f3679a51f29cdaa8cb6c8211fa6ecaad3a852c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 2 May 2010 23:03:16 +0200 Subject: [PATCH] wcwidth: Declare also when it's aliased. --- ChangeLog | 6 ++++++ lib/wchar.in.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 69e7f2693..c65aaa4ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-05-02 Bruno Haible + 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 + 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 -- 2.11.0