From 666e8f922ffe516cb4803887a91ddd75f308a79d Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Mon, 12 Aug 2002 04:32:41 +0000 Subject: Revert commit by davidm to printf.c that initialized conv_num needlessly. To do so increases the generated code size with bcc. Eliminate duplicate define warnings in wstring.c. Fix potentially broken preprocessor comparisons. The preprocessor converts integers to maximal signed type, so inequality comparisons involving UINTMAX_MAX, ULLONG_MAX, and (if no long long) ULONG_MAX were potentially broken. --- libc/string/wstring.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libc/string/wstring.c') diff --git a/libc/string/wstring.c b/libc/string/wstring.c index 6957b1fb8..c3dc32dbb 100644 --- a/libc/string/wstring.c +++ b/libc/string/wstring.c @@ -876,6 +876,9 @@ Wchar *Wstrstr(const Wchar *s1, const Wchar *s2) #endif /**********************************************************************/ +#undef Wstrspn +#undef Wstrpbrk + #ifdef L_wcstok #define L_strtok_r #define Wstrtok_r wcstok @@ -1160,6 +1163,9 @@ void *memccpy(void * __restrict s1, const void * __restrict s2, int c, size_t n) #endif /**********************************************************************/ +#undef Wstrlen +#undef Wstrcpy + #ifdef L_wcsdup #define L_strdup #define Wstrdup wcsdup -- cgit v1.2.3