From ce85d65bae842fad22fa8e9cb4ad122daeef7831 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 19 Oct 1998 15:22:14 +0000 Subject: Update. 1998-10-19 Ulrich Drepper * 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 * 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 * sysdeps/unix/sysv/linux/arm/syscalls.list: Added setfsgid and setfsuid. 1998-10-19 Andreas Jaeger * 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. --- iconv/skeleton.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'iconv/skeleton.c') diff --git a/iconv/skeleton.c b/iconv/skeleton.c index bae82be3ed..b1e96ebbcb 100644 --- a/iconv/skeleton.c +++ b/iconv/skeleton.c @@ -85,8 +85,8 @@ #ifndef STATIC_GCONV # include -# include #endif +#include /* The direction objects. */ @@ -222,15 +222,9 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data, if (status == GCONV_OK) #endif - { - /* Give the modules below the same chance. */ -#ifdef DL_CALL_FCT - status = DL_CALL_FCT (fct, (next_step, next_data, NULL, NULL, - written, 1)); -#else - status = (*fct) (next_step, next_data, NULL, NULL, written, 1); -#endif - } + /* Give the modules below the same chance. */ + status = DL_CALL_FCT (fct, (next_step, next_data, NULL, NULL, + written, 1)); } } else @@ -296,13 +290,8 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data, const char *outerr = data->outbuf; int result; -#ifdef DL_CALL_FCT result = DL_CALL_FCT (fct, (next_step, next_data, &outerr, outbuf, written, 0)); -#else - result = (*fct) (next_step, next_data, &outerr, outbuf, - written, 0); -#endif if (result != GCONV_EMPTY_INPUT) { -- cgit 1.4.1