From ceba9f29f6a128b78719e4cc11a8928588b5176e Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 27 Feb 2009 08:46:07 -0700 Subject: [PATCH] printf: fix regression in previous patch * m4/printf.m4 (gl_PRINTF_DIRECTIVE_LS): Fix compilation error. Signed-off-by: Eric Blake --- ChangeLog | 7 ++++++- m4/printf.m4 | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9791df77d1..ee4e23f3a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-02-27 Eric Blake + + printf: fix regression in previous patch + * m4/printf.m4 (gl_PRINTF_DIRECTIVE_LS): Fix compilation error. + 2009-02-27 Bruno Haible * lib/inttypes.in.h: Test merely whether _LP64 is defined, not its @@ -58,7 +63,7 @@ See http://lists.gnu.org/archive/html/bug-gnulib/2009-02/msg00190.html. 2009-02-26 Eric Blake - Bruno Haible + Bruno Haible Work around a *printf bug with %ls on Solaris. * m4/printf.m4 (gl_PRINTF_DIRECTIVE_LS): Also test whether, when a diff --git a/m4/printf.m4 b/m4/printf.m4 index 6da62dfffa..4142b9b28f 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,4 +1,4 @@ -# printf.m4 serial 32 +# printf.m4 serial 33 dnl Copyright (C) 2003, 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -656,7 +656,7 @@ int main () This test fails on OpenBSD 4.0, IRIX 6.5, Solaris 2.6, Haiku, Cygwin 1.5. */ { - static const wchar_t wstring[] = { 'a', 'b', 'c', 0 }; + static wchar_t wstring[] = { 'a', 'b', 'c', 0 }; buf[0] = '\0'; if (sprintf (buf, "%ls", wstring) < 0 || strcmp (buf, "abc") != 0) -- 2.30.2