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_db.c | |
| parent | 816e6eb5a786594223586976c08e337bc08b6f4e (diff) | |
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_db.c')
| -rw-r--r-- | iconv/gconv_db.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c index cbaaf18339..443e5bf878 100644 --- a/iconv/gconv_db.c +++ b/iconv/gconv_db.c @@ -23,10 +23,7 @@ #include <string.h> #include <bits/libc-lock.h> -#ifndef STATIC_GCONV -# include <elf/ldsodefs.h> -#endif - +#include <ldsodefs.h> #include <gconv_int.h> @@ -158,11 +155,7 @@ free_derivation (void *p) for (cnt = 0; cnt < deriv->nsteps; ++cnt) if (deriv->steps[cnt].end_fct) -#ifdef _CALL_DL_FCT _CALL_DL_FCT (deriv->steps[cnt].end_fct, (&deriv->steps[cnt])); -#else - deriv->steps[cnt].end_fct (&deriv->steps[cnt]); -#endif free ((struct gconv_step *) deriv->steps); free (deriv); @@ -228,11 +221,7 @@ gen_steps (struct derivation_step *best, const char *toset, /* Call the init function. */ if (result[step_cnt].init_fct != NULL) -#ifdef _CALL_DL_FCT _CALL_DL_FCT (result[step_cnt].init_fct, (&result[step_cnt])); -#else - result[step_cnt].init_fct (&result[step_cnt]); -#endif current = current->last; } @@ -243,11 +232,7 @@ gen_steps (struct derivation_step *best, const char *toset, while (++step_cnt < *nsteps) { if (result[step_cnt].end_fct != NULL) -#ifdef _CALL_DL_FCT _CALL_DL_FCT (result[step_cnt].end_fct, (&result[step_cnt])); -#else - result[step_cnt].end_fct (&result[step_cnt]); -#endif #ifndef STATIC_GCONV __gconv_release_shlib (result[step_cnt].shlib_handle); #endif |