lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Update.

Browse Source 
1998-10-16 10:07  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/Makefile [! elf]: Define CFLAGS-gconv_simple.c to
	-DSTATIC_GCONV.
	* iconv/skeleton.c: Include ELF header only of STATIC?GCONV is not
	defined.  Avoid using DL_CLL_FCT if it is not defined.

1998-10-16 10:40 -0400  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* resolv/arpa/nameser.h: Include sys/types.h unconditionally.
	Include endian.h unconditionally.  Remove portability goop
	depending on #ifdef linux, #ifdef BSD, #ifdef machine-type.

1998-10-16 11:39 -0400  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* sunrpc/rpc/types.h: Mark file so fixincludes won't modify it.
This commit is contained in:
Ulrich Drepper
1998-10-16 11:41:15 +00:00
parent a9e73d4044
commit c66dbe00b9
8 changed files with 76 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
iconv/skeleton.c
View File

@ -77,13 +77,16 @@
*/
#include <assert.h>
#include <dlfcn.h>
#include <gconv.h>
#include <string.h>
#define __need_size_t
#define __need_NULL
#include <stddef.h>
#include <elf/ldsodefs.h>
#ifndef STATIC_GCONV
# include <dlfcn.h>
# include <elf/ldsodefs.h>
#endif
/* The direction objects. */
@ -219,9 +222,15 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
if (status == GCONV_OK)
#endif
/* Give the modules below the same chance. */
status = DL_CALL_FCT (fct, (next_step, next_data, NULL, NULL,
written, 1));
{
/* 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
}
}
}
else
@ -287,8 +296,13 @@ 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)
{