aboutsummaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-10-19 15:22:14 +0000
committerUlrich Drepper <drepper@redhat.com>1998-10-19 15:22:14 +0000
commitce85d65bae842fad22fa8e9cb4ad122daeef7831 (patch)
tree88b5d68fe4b1be9132a7a85840f001ff1a86c1b7 /iconv
parent816e6eb5a786594223586976c08e337bc08b6f4e (diff)
downloadglibc-ce85d65bae842fad22fa8e9cb4ad122daeef7831.zip
glibc-ce85d65bae842fad22fa8e9cb4ad122daeef7831.tar.gz
glibc-ce85d65bae842fad22fa8e9cb4ad122daeef7831.tar.bz2
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')
-rw-r--r--iconv/gconv.c13
-rw-r--r--iconv/gconv_db.c17
-rw-r--r--iconv/gconv_dl.c2
-rw-r--r--iconv/skeleton.c19
4 files changed, 7 insertions, 44 deletions
diff --git a/iconv/gconv.c b/iconv/gconv.c
index ceefffc..cc61e03 100644
--- a/iconv/gconv.c
+++ b/iconv/gconv.c
@@ -23,9 +23,7 @@
#include <gconv.h>
#include <sys/param.h>
-#ifndef STATIC_GCONV
-# include <elf/ldsodefs.h>
-#endif
+#include <ldsodefs.h>
int
internal_function
@@ -43,12 +41,8 @@ __gconv (gconv_t cd, const char **inbuf, const char *inbufend, char **outbuf,
if (inbuf == NULL || *inbuf == NULL)
/* We just flush. */
-#ifdef _CALL_DL_FCT
result = _CALL_DL_FCT (cd->steps->fct,
(cd->steps, cd->data, NULL, NULL, converted, 1));
-#else
- result = cd->steps->fct (cd->steps, cd->data, NULL, NULL, converted, 1);
-#endif
else
{
const char *last_start;
@@ -60,14 +54,9 @@ __gconv (gconv_t cd, const char **inbuf, const char *inbufend, char **outbuf,
do
{
last_start = *inbuf;
-#ifdef _CALL_DL_FCT
result = _CALL_DL_FCT (cd->steps->fct,
(cd->steps, cd->data, inbuf, inbufend,
converted, 0));
-#else
- result = cd->steps->fct (cd->steps, cd->data, inbuf, inbufend,
- converted, 0);
-#endif
}
while (result == GCONV_EMPTY_INPUT && last_start != *inbuf
&& *inbuf + cd->steps->min_needed_from <= inbufend);
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index cbaaf18..443e5bf 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
diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c
index 1c04dee..7c64a91 100644
--- a/iconv/gconv_dl.c
+++ b/iconv/gconv_dl.c
@@ -24,9 +24,9 @@
#include <stdlib.h>
#include <string.h>
#include <bits/libc-lock.h>
-#include <elf/ldsodefs.h>
#include <sys/param.h>
+#include <ldsodefs.h>
#include <gconv_int.h>
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index bae82be..b1e96eb 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -85,8 +85,8 @@
#ifndef STATIC_GCONV
# include <dlfcn.h>
-# include <elf/ldsodefs.h>
#endif
+#include <ldsodefs.h>
/* 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)
{