diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | iconvdata/tst-table-from.c | 3 | ||||
| -rw-r--r-- | iconvdata/tst-table-to.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d1231a7dac..3b4e2f0261 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-09-07 Ulrich Drepper <drepper@redhat.com> + * iconvdata/tst-table-to.c (main): Correct cast in iconv call. + * iconvdata/tst-table-from.c: Include <string.h>. + (try): Correct cast in iconv call. + * elf/Makefile (all-rtld-routines): Evaluate $(sysdep-rtld-routines) too. * sysdeps/powerpc/Makefile (sysdep-rtld-routines): New variable. diff --git a/iconvdata/tst-table-from.c b/iconvdata/tst-table-from.c index bd2647eae0..92a562d884 100644 --- a/iconvdata/tst-table-from.c +++ b/iconvdata/tst-table-from.c @@ -24,6 +24,7 @@ #include <stddef.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <iconv.h> #include <errno.h> @@ -64,7 +65,7 @@ try (iconv_t cd, unsigned char buf[], unsigned int buflen, unsigned char *out) char *outbuf = (char *) out; size_t outbytesleft = 6; size_t result = iconv (cd, - (char *) &inbuf, &inbytesleft, + (char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft); if (result == (size_t)(-1)) { diff --git a/iconvdata/tst-table-to.c b/iconvdata/tst-table-to.c index b725f1f52e..329ba4ad0f 100644 --- a/iconvdata/tst-table-to.c +++ b/iconvdata/tst-table-to.c @@ -59,7 +59,7 @@ main (int argc, char *argv[]) char *outbuf = (char *) buf; size_t outbytesleft = sizeof (buf); size_t result = iconv (cd, - (char *) &inbuf, &inbytesleft, + (char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft); if (result == (size_t)(-1)) { |