diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-02 00:41:37 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-02 00:41:37 +0000 |
| commit | 9acef89e60381a298801e4b221d66b1538072b28 (patch) | |
| tree | 76643b24b4f8fc6590e392672102e5b30499ba73 /libc/misc/wchar/wchar.c | |
| parent | a4a74b5760c426cede2ef36d35cb873f98b9f17b (diff) | |
| download | uClibc-alpine-9acef89e60381a298801e4b221d66b1538072b28.tar.bz2 uClibc-alpine-9acef89e60381a298801e4b221d66b1538072b28.tar.xz | |
Merge from trunk. More to come you betcha'.
Diffstat (limited to 'libc/misc/wchar/wchar.c')
| -rw-r--r-- | libc/misc/wchar/wchar.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index 055900827..1691e00e0 100644 --- a/libc/misc/wchar/wchar.c +++ b/libc/misc/wchar/wchar.c @@ -98,8 +98,6 @@ * Manuel */ -#define memmove __memmove - #define _GNU_SOURCE #define _ISOC99_SOURCE #include <errno.h> @@ -1620,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, @@ -1697,7 +1695,7 @@ int main(int argc, char **argv) } } if (ni) { /* still bytes in buffer! */ - memmove(ibuf, pi, ni); + __memmove(ibuf, pi, ni); } } |