diff options
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv.c | 5 | ||||
| -rw-r--r-- | iconv/gconv_db.c | 7 | ||||
| -rw-r--r-- | iconv/skeleton.c | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/iconv/gconv.c b/iconv/gconv.c index 3120f00b3f..f51af4a4d8 100644 --- a/iconv/gconv.c +++ b/iconv/gconv.c @@ -23,7 +23,6 @@ #include <gconv.h> #include <sys/param.h> #include <dlfcn.h> -#include <ldsodefs.h> int internal_function @@ -42,7 +41,7 @@ __gconv (__gconv_t cd, const unsigned char **inbuf, if (inbuf == NULL || *inbuf == NULL) /* We just flush. */ - result = _CALL_DL_FCT (cd->__steps->__fct, + result = DL_CALL_FCT (cd->__steps->__fct, (cd->__steps, cd->__data, NULL, NULL, converted, 1)); else @@ -56,7 +55,7 @@ __gconv (__gconv_t cd, const unsigned char **inbuf, do { last_start = *inbuf; - result = _CALL_DL_FCT (cd->__steps->__fct, + result = DL_CALL_FCT (cd->__steps->__fct, (cd->__steps, cd->__data, inbuf, inbufend, converted, 0)); } 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 diff --git a/iconv/skeleton.c b/iconv/skeleton.c index cd750ba8ae..0bcad9e6d0 100644 --- a/iconv/skeleton.c +++ b/iconv/skeleton.c @@ -86,8 +86,6 @@ #ifndef STATIC_GCONV # include <dlfcn.h> #endif -#include <ldsodefs.h> - /* The direction objects. */ #if DEFINE_DIRECTION_OBJECTS || DEFINE_INIT |