diff options
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 |