From 3ba06713f8c2c40f3bf0cc9431352ba873701dcd Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 4 Aug 2002 20:54:20 +0000 Subject: Update. 2002-08-04 Jakub Jelinek * manual/debug.texi: Fix spelling to programmatically. Reported by . * include/libio.h: Add libc_hidden_proto for __uflow. * include/stdio.h: Map fopen, fdopen, fclose, fputs, fsetpos, and fgetpos to _IO_* names. Add libc_hidden_proto for fileno, fwrite, fseek, fflush_unlocked, fread_unlocked, fwrite_unlocked, fgets_unlocked, fputs_unlocked. * include/wchar.h: Add libc_hidden_proto for fputws_unlocked, putwc_unlocked, vswscanf. * libio/iolibio.h: Add libc_hidden_proto for _IO_fputs. * libio/fileno.c: Use and libc_hidden_def. * libio/fseek.c: Likewise. * libio/fmemopen.c: Include "libioP.h". Call _IO_fopencookie and not fopencookie. * libio/genops.c (__uflow): Add libc_hidden_def. * libio/iofflush_u.c (fflush_unlocked): Likewise. * libio/iofgets_u.c (fgets_unlocked): Likewise. * libio/iofputs_u.c (fputs_unlocked): Likewise. * libio/iofputws_u.c (fputws_unlocked): Likewise. * libio/iofread_u.c (fread_unlocked): Likewise. * libio/iofwrite_u.c (fwrite_unlocked): Likewise. * libio/iovswscanf.c (vswscanf): Likewise. * libio/putwc_u.c (putwc_unlocked): Likewise. * libio/iofputs.c: Use libc_hidden_def instead of INTDEF. * malloc/malloc.c: Redirect fwrite calls to _IO_fwrite. * malloc/mtrace.c: Likewise. * sunrpc/clnt_perr.c: Remove fputs macro. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * iconv/Makefile: Add CPPFLAGS definitions with -DNOT_in_libc for iconv_prog, linereader, and charmap-dir. * locale/Makefile: Likewise for locale and charmap-dir. * malloc/Makefile: Likewise for memusagestat. * nscd/Makefile: Likewise for nscd, nscd_conf, and dbg_log. * sunrpc/Makefile: Likewise for rpc_main. * sysdeps/unix/sysv/linux/Makefile: Likewise for lddlibc4. * timezone/Makefile: Likewise for zic. * stdio-common/perror.c: Avoid multiple calls to fileno_unlocked. --- malloc/Makefile | 2 ++ malloc/malloc.c | 2 ++ malloc/mtrace.c | 1 + 3 files changed, 5 insertions(+) (limited to 'malloc') diff --git a/malloc/Makefile b/malloc/Makefile index 226ed99fc3..bb7d15db7b 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -56,6 +56,8 @@ aux := set-freeres include ../Makeconfig +CPPFLAGS-memusagestat = -DNOT_IN_libc + # The Perl script to analyze the output of the mtrace functions. ifneq ($(PERL),no) install-bin-script = mtrace diff --git a/malloc/malloc.c b/malloc/malloc.c index 08b8e86794..685514900c 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -490,6 +490,8 @@ Void_t *(*__morecore)(ptrdiff_t) = __default_morecore; #ifndef _LIBC #define __builtin_expect(expr, val) (expr) + +#define fwrite(buf, size, count, fp) _IO_fwrite (buf, size, count, fp) #endif /* diff --git a/malloc/mtrace.c b/malloc/mtrace.c index 171eb5a570..52347ea117 100644 --- a/malloc/mtrace.c +++ b/malloc/mtrace.c @@ -42,6 +42,7 @@ # include # define fopen(f, n) _IO_fopen64 (f, n) # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) +# define fwrite(buf, size, count, fp) _IO_fwrite (buf, size, count, fp) #endif #ifndef attribute_hidden -- cgit v1.2.1