summaryrefslogtreecommitdiff
path: root/libc/string/wstring.c
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2002-08-12 04:32:41 +0000
committerManuel Novoa III <mjn3@codepoet.org>2002-08-12 04:32:41 +0000
commit666e8f922ffe516cb4803887a91ddd75f308a79d (patch)
treec1d5e82d40b2ca178d179d5f1887ef1f88142a53 /libc/string/wstring.c
parent9a34fd5b8807487a89bb9dd4e895f1f448d75e94 (diff)
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.
Diffstat (limited to 'libc/string/wstring.c')
-rw-r--r--libc/string/wstring.c6
1 files changed, 6 insertions, 0 deletions
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