diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-10-19 15:22:14 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-10-19 15:22:14 +0000 |
| commit | ce85d65bae842fad22fa8e9cb4ad122daeef7831 (patch) | |
| tree | 88b5d68fe4b1be9132a7a85840f001ff1a86c1b7 /iconv/gconv.c | |
| parent | 816e6eb5a786594223586976c08e337bc08b6f4e (diff) | |
| download | glibc-ce85d65bae842fad22fa8e9cb4ad122daeef7831.tar glibc-ce85d65bae842fad22fa8e9cb4ad122daeef7831.tar.gz glibc-ce85d65bae842fad22fa8e9cb4ad122daeef7831.tar.bz2 glibc-ce85d65bae842fad22fa8e9cb4ad122daeef7831.zip | |
Update.
1998-10-19 Ulrich Drepper <drepper@cygnus.com>
* include/ldsodefs.h: New file.
* iconv/gconv.c: Include ldsodefs.h, not elf/ldsodefs.h.
Remove change to avoid using _CALL_DL_FCT.
* iconv/gconv_db.c: Likewise.
* iconv/gconv_dl.c: Likewise.
* iconv/skeleton.c: Likewise, here for DL_CALL_FCT.
* malloc/mtrace.c: Include ldsodefs.h, not elf/ldsodefs.h.
* nss/nsswitch.c: Likewise.
* nss/nsswitch.h: Likewise.
1998-10-19 Philip Blundell <pb@nexus.co.uk>
* sunrpc/Makefile (otherlibs): If static NSS is in use, set to the
required libraries.
* login/Makefile (otherlibs): Likewise.
* nscd/Makefile (otherlibs): Likewise.
* Makeconfig (link-libc) [! build_shared]: Add $(otherlibs).
* debug/Makefile (install-bin): Only build catchsegv if using ELF.
* inet/Makefile: Add -DSTATIC_NSS to CFLAGS.
1998-10-19 Philip Blundell <pb@nexus.co.uk>
* sysdeps/unix/sysv/linux/arm/syscalls.list: Added setfsgid
and setfsuid.
1998-10-19 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* nscd/connections.c: Fix typos in comments and strings.
* nscd/nscd.conf: Update according to recent changes to nscd.
* nscd/cache.c (prune_cache): Remove wrong comment.
copy_posix.mask for copy instruction.
Diffstat (limited to 'iconv/gconv.c')
| -rw-r--r-- | iconv/gconv.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/iconv/gconv.c b/iconv/gconv.c index ceefffcc87..cc61e03954 100644 --- a/iconv/gconv.c +++ b/iconv/gconv.c @@ -23,9 +23,7 @@ #include <gconv.h> #include <sys/param.h> -#ifndef STATIC_GCONV -# include <elf/ldsodefs.h> -#endif +#include <ldsodefs.h> int internal_function @@ -43,12 +41,8 @@ __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; @@ -60,14 +54,9 @@ __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); |