diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-07-07 18:39:33 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-07-07 18:39:33 +0000 |
| commit | 94e365c61202e2472c8aea42c7c95ce40f5b843c (patch) | |
| tree | 15cf6a02604ab91d5aa1feeaeb338f0fc6b91f34 /iconv/gconv_db.c | |
| parent | 2556bfe6fdb5ccb4864e0249d5fdd475e4100c71 (diff) | |
| download | glibc-94e365c61202e2472c8aea42c7c95ce40f5b843c.tar glibc-94e365c61202e2472c8aea42c7c95ce40f5b843c.tar.gz glibc-94e365c61202e2472c8aea42c7c95ce40f5b843c.tar.bz2 glibc-94e365c61202e2472c8aea42c7c95ce40f5b843c.zip | |
Update.
* sysdeps/gnu/Makefile (libdl-routines): Add eval.
1999-07-06 Zack Weinberg <zack@rabi.columbia.edu>
* dlfcn: New directory. Move the following files from elf:
dladdr.c, dlclose.c, dlerror.c, dlfcn.h, dlopen.c,
dlopenold.c, dlsym.c, dlvsym.c.
* dlfcn/Makefile: New file.
* dlfcn/Versions: New file.
* dlfcn/dlsym.c: All ELF-specific code split out to new
function _dl_sym.
* dlfcn/dlvsym.c: All ELF-specific code split out to new
function _dl_vsym.
* elf/dl-sym.c: New file. _dl_sym and _dl_vsym are
implemented here.
* dlfcn/dladdr.c: Remove all references to ELF data structures
or headers.
* dlfcn/dlclose.c: Likewise.
* dlfcn/dlerror.c: Likewise.
* dlfcn/dlopen.c: Likewise.
* dlfcn/dlopenold.c: Likewise.
* Makeconfig (dlfcn): New variable - set to `dlfcn' if elf is
yes, empty otherwise.
(libdl): Set to dlfcn/libdl.so or libdl.a if elf is yes,
depending on build-shared.
(subdirs): Add $(dlfcn).
(rpath-dirs): Add dlfcn.
* elf/Makefile: Remove all references to libdl or its
components, except the ones relating to the test cases.
(routines): Add dl-sym.
* elf/Versions (libc): Add _dl_sym and _dl_vsym for GLIBC_2.2.
(libdl): Delete.
* elf/dl-close.c (_dl_close): Change argument to void *.
* elf/dl-open.c (_dl_open): Change return type to void *.
* elf/eval.c: Removed.
* elf/ldsodefs.h: Move prototypes of _dl_catch_error,
_dlerror_run, _dl_open, _dl_close, _dl_addr, and
_dl_mcount_wrapper_check to include/dlfcn.h. Delete
_CALL_DL_FCT macro.
* include/dlfcn.h: Also prototype _dl_sym and _dl_vsym here.
Include real header from dlfcn directory.
* include/ldsodefs.h: Removed.
* grp/initgroups.c: Use DL_CALL_FCT not _CALL_DL_FCT.
* nss/getXXbyYY_r.c: Likewise.
* nss/getXXent_r.c: Likewise.
* iconv/gconv.c: Likewise. Don't include ldsodefs.h.
* iconv/gconv_db.c: Likewise. Don't include ldsodefs.h.
* iconv/skeleton.c: Don't include ldsodefs.h.
* nss/nsswitch.h: Don't include ldsodefs.h. Include dlfcn.h.
1999-07-07 Ulrich Drepper <drepper@cygnus.com>
Diffstat (limited to 'iconv/gconv_db.c')
| -rw-r--r-- | iconv/gconv_db.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c index 39292994d8..9fe075985a 100644 --- a/iconv/gconv_db.c +++ b/iconv/gconv_db.c @@ -26,7 +26,6 @@ #include <bits/libc-lock.h> #include <dlfcn.h> -#include <ldsodefs.h> #include <gconv_int.h> @@ -165,7 +164,7 @@ free_derivation (void *p) for (cnt = 0; cnt < deriv->nsteps; ++cnt) if (deriv->steps[cnt].__end_fct) - _CALL_DL_FCT (deriv->steps[cnt].__end_fct, (&deriv->steps[cnt])); + DL_CALL_FCT (deriv->steps[cnt].__end_fct, (&deriv->steps[cnt])); /* Free the name strings. */ free ((char *) deriv->steps[0].__from_name); @@ -237,7 +236,7 @@ gen_steps (struct derivation_step *best, const char *toset, /* Call the init function. */ if (result[step_cnt].__init_fct != NULL) { - status = _CALL_DL_FCT (result[step_cnt].__init_fct, + status = DL_CALL_FCT (result[step_cnt].__init_fct, (&result[step_cnt])); if (status != __GCONV_OK) @@ -258,7 +257,7 @@ gen_steps (struct derivation_step *best, const char *toset, while (++step_cnt < *nsteps) { if (result[step_cnt].__end_fct != NULL) - _CALL_DL_FCT (result[step_cnt].__end_fct, (&result[step_cnt])); + DL_CALL_FCT (result[step_cnt].__end_fct, (&result[step_cnt])); #ifndef STATIC_GCONV __gconv_release_shlib (result[step_cnt].__shlib_handle); #endif |