From 3720c42fcc3645f08053087b29e8f44cf9aeb438 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 10 Dec 2005 00:22:53 +0000 Subject: Switch fread/fwrite/fclose/pipe/sigsetmask users --- include/libc-internal.h | 2 ++ libc/inet/rpc/rcmd.c | 1 + libc/inet/rpc/xdr_stdio.c | 3 +++ libc/misc/wchar/wchar.c | 2 ++ libc/misc/wordexp/wordexp.c | 1 + libc/stdio/popen.c | 1 + 6 files changed, 10 insertions(+) diff --git a/include/libc-internal.h b/include/libc-internal.h index 05114aab8..3bf8c00ac 100644 --- a/include/libc-internal.h +++ b/include/libc-internal.h @@ -192,6 +192,7 @@ extern int __sprintf (char *__restrict __s, __const char *__restrict __format, ...) attribute_hidden; /* hack */ #define fprintf __fprintf +#define fclose __fclose /* #include */ extern char *__getenv (__const char *__name) attribute_hidden; @@ -217,6 +218,7 @@ extern int __vfprintf (FILE *__restrict __s, __const char *__restrict __format, __gnuc_va_list __arg) attribute_hidden; extern int __fprintf (FILE *__restrict __stream, __const char *__restrict __format, ...) attribute_hidden; +extern int __fclose (FILE *__stream) attribute_hidden; /* #include */ # define __need_timeval diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c index bd459826a..c2eed87d4 100644 --- a/libc/inet/rpc/rcmd.c +++ b/libc/inet/rpc/rcmd.c @@ -55,6 +55,7 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; #define poll __poll #define accept __accept #define listen __listen +#define sigsetmask __sigsetmask #define __FORCE_GLIBC #include diff --git a/libc/inet/rpc/xdr_stdio.c b/libc/inet/rpc/xdr_stdio.c index 411cf17da..bd9ee4f1b 100644 --- a/libc/inet/rpc/xdr_stdio.c +++ b/libc/inet/rpc/xdr_stdio.c @@ -37,6 +37,9 @@ * from the stream. */ +#define fread __fread +#define fwrite __fwrite + #include #include #include diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index 4ef93eaff..0d7d8371a 100644 --- a/libc/misc/wchar/wchar.c +++ b/libc/misc/wchar/wchar.c @@ -99,6 +99,8 @@ */ #define vfprintf __vfprintf +#define fread __fread +#define fwrite __fwrite #define _GNU_SOURCE #define _ISOC99_SOURCE diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c index a850b2aca..e76d6a63a 100644 --- a/libc/misc/wordexp/wordexp.c +++ b/libc/misc/wordexp/wordexp.c @@ -33,6 +33,7 @@ #define dup2 __dup2 #define atoi __atoi #define fnmatch __fnmatch +#define pipe __pipe #if 0 #define glob __glob #define globfree __globfree diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c index 14a36aa64..c3ee09381 100644 --- a/libc/stdio/popen.c +++ b/libc/stdio/popen.c @@ -18,6 +18,7 @@ #define execl __execl #define dup2 __dup2 #define fdopen __fdopen +#define pipe __pipe #include #include -- cgit v1.2.3