From 01cad84e1996a6f20bf19609d0554c73f2ee33d5 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 12 Nov 2014 22:38:11 +0000 Subject: Fix __printf_fp wmemset namespace (bug 17574). __printf_fp calls wmemset, but that is not an ISO C90 function. This patch fixes it to call a new __wmemset name instead (with wmemset being a weak alias). Tested for x86_64 (testsuite, and that disassembly of installed shared libraries is unchanged by the patch). [BZ #17574] * wcsmbs/wmemset.c (wmemset): Rename to __wmemset and define as weak alias of __wmemset. Use libc_hidden_weak. (__wmemset): Use libc_hidden_def. * include/wchar.h (__wmemset): Declare. Use libc_hidden_proto. * stdio-common/printf_fp.c (___printf_fp): Call __wmemset instead of wmemset. --- stdio-common/printf_fp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stdio-common') diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c index c8061cbb90..406180cd6e 100644 --- a/stdio-common/printf_fp.c +++ b/stdio-common/printf_fp.c @@ -1112,7 +1112,7 @@ ___printf_fp (FILE *fp, wstartp[1] = decimalwc; if (wcp >= wstartp + 2) { - wmemset (wstartp + 6, L'0', wcp - (wstartp + 2)); + __wmemset (wstartp + 6, L'0', wcp - (wstartp + 2)); wcp += 4; } else -- cgit 1.4.1