diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-10-19 13:33:29 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-10-19 13:33:29 +0000 |
| commit | 816e6eb5a786594223586976c08e337bc08b6f4e (patch) | |
| tree | f40c1af0b36c777b5987dc6c888e9492518d14da /iconv/gconv.c | |
| parent | 685c167680a6d1040abc5ff33bd25e5f423f9405 (diff) | |
| download | glibc-816e6eb5a786594223586976c08e337bc08b6f4e.tar.gz | |
Update.
1998-10-19 13:24 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-collate.c (collate_startup): Clear bit for this
category in copy_posix.
(collate_finish): Don't warn about UNDEFINED not being defined.
* locale/programs/ld-ctype.c (ctype_startup): Clear bit for this
category in copy_posix.
* locale/programs/ld-messages.c (messages_startup): Likewise.
* locale/programs/ld-monetary.c (monetary_startup): Likewise.
* locale/programs/ld-numeric.c (numeric_startup): Likewise.
* locale/programs/ld-time.c (time_startup): Likewise.
* locale/programs/localedef.c: Move copy_def_list_t definition into
locales.h. Define copy_posix variable.
(main): Before processing copy list add ©_posix to copy_list.
* locale/programs/locales.h: Add definition of copy_def_list_t.
* locale/programs/locfile.c: Clear bit for appropriate category in
case of an copy instruction.
Diffstat (limited to 'iconv/gconv.c')
| -rw-r--r-- | iconv/gconv.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/iconv/gconv.c b/iconv/gconv.c index 9484fc8881..ceefffcc87 100644 --- a/iconv/gconv.c +++ b/iconv/gconv.c @@ -22,8 +22,10 @@ #include <assert.h> #include <gconv.h> #include <sys/param.h> -#include <elf/ldsodefs.h> +#ifndef STATIC_GCONV +# include <elf/ldsodefs.h> +#endif int internal_function @@ -41,8 +43,12 @@ __gconv (gconv_t cd, const char **inbuf, const char *inbufend, char **outbuf, if (inbuf == NULL || *inbuf == NULL) /* We just flush. */ +#ifdef _CALL_DL_FCT result = _CALL_DL_FCT (cd->steps->fct, (cd->steps, cd->data, NULL, NULL, converted, 1)); +#else + result = cd->steps->fct (cd->steps, cd->data, NULL, NULL, converted, 1); +#endif else { const char *last_start; @@ -54,9 +60,14 @@ __gconv (gconv_t cd, const char **inbuf, const char *inbufend, char **outbuf, do { last_start = *inbuf; +#ifdef _CALL_DL_FCT result = _CALL_DL_FCT (cd->steps->fct, (cd->steps, cd->data, inbuf, inbufend, converted, 0)); +#else + result = cd->steps->fct (cd->steps, cd->data, inbuf, inbufend, + converted, 0); +#endif } while (result == GCONV_EMPTY_INPUT && last_start != *inbuf && *inbuf + cd->steps->min_needed_from <= inbufend); |