From dec40863edc983e258161516a57413659b7fcfb9 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Tue, 6 Dec 2005 15:44:34 +0000 Subject: Correct typo, iconv binary does not use the internal versions --- libc/misc/wchar/wchar.c | 4 ++-- utils/Makefile.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index 9f3da8626..1a16fc9d6 100644 --- a/libc/misc/wchar/wchar.c +++ b/libc/misc/wchar/wchar.c @@ -1618,7 +1618,7 @@ int main(int argc, char **argv) break; } do { - if ((s = __strchr(opt_chars,*p)) == NULL) { + if ((s = strchr(opt_chars,*p)) == NULL) { USAGE: s = basename(progname); fprintf(stderr, @@ -1695,7 +1695,7 @@ int main(int argc, char **argv) } } if (ni) { /* still bytes in buffer! */ - __memmove(ibuf, pi, ni); + memmove(ibuf, pi, ni); } } diff --git a/utils/Makefile.in b/utils/Makefile.in index f29721bb1..b0bf2c31f 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -65,7 +65,7 @@ utils: $(utils_OBJ) $(utils_ICONV_OBJ) $(utils_OBJ): $(utils_OUT)/% : $(utils_DIR)/%.c | $(libc) $(compile.u) -$(utils_OUT)/iconv.c: $(top_srcdir)libc/misc/wchar/wchar.c | $(libc) +$(utils_OUT)/iconv: $(top_srcdir)libc/misc/wchar/wchar.c | $(libc) $(compile.u) hostutils: $(hostutils_OBJ) -- cgit v1.2.3