From e523bd15353350c3480b8a1820a0944b0fa8212e Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sat, 7 Jan 2006 02:32:27 +0000 Subject: Big fricking merge from trunk. --- libc/misc/error/error.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libc/misc/error/error.c') diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c index 5427e9568..b51177e35 100644 --- a/libc/misc/error/error.c +++ b/libc/misc/error/error.c @@ -24,6 +24,7 @@ #define strerror __strerror #define vfprintf __vfprintf +#define fflush __fflush #include #include @@ -31,6 +32,7 @@ #include #include "error.h" +extern int __putc(int c, FILE *stream) attribute_hidden; /* This variable is incremented each time `error' is called. */ unsigned int error_message_count; @@ -56,9 +58,9 @@ void __error (int status, int errnum, const char *message, ...) if (errnum) { fprintf (stderr, ": %s", strerror (errnum)); } - putc ('\n', stderr); + __putc ('\n', stderr); if (status) - exit (status); + __exit (status); } void __error_at_line (int status, int errnum, const char *file_name, @@ -92,9 +94,9 @@ void __error_at_line (int status, int errnum, const char *file_name, if (errnum) { fprintf (stderr, ": %s", strerror (errnum)); } - putc ('\n', stderr); + __putc ('\n', stderr); if (status) - exit (status); + __exit (status); } /* Use the weaks here in an effort at controlling namespace pollution */ -- cgit v1.2.3