From d2db9bdb4c79afcd4b09353346cd4eaf63b6cd2c Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Thu, 24 Aug 2006 02:51:45 +0000 Subject: Merge from trunk and bring in NPTL code in the various 'misc' subsystems. --- libc/misc/error/error.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libc/misc/error/error.c') diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c index 3e44a01ee..08044ac83 100644 --- a/libc/misc/error/error.c +++ b/libc/misc/error/error.c @@ -35,8 +35,6 @@ libc_hidden_proto(vfprintf) libc_hidden_proto(fflush) libc_hidden_proto(fputc) libc_hidden_proto(__fputc_unlocked) -libc_hidden_proto(stdout) -libc_hidden_proto(stderr) /* This variable is incremented each time `error' is called. */ unsigned int error_message_count = 0; @@ -66,6 +64,7 @@ void __error (int status, int errnum, const char *message, ...) if (status) exit (status); } +weak_alias(__error,error) extern __typeof(error_at_line) __error_at_line attribute_hidden; void __error_at_line (int status, int errnum, const char *file_name, @@ -103,7 +102,4 @@ void __error_at_line (int status, int errnum, const char *file_name, if (status) exit (status); } - -/* psm: keep this weak, too many use this in common code */ -weak_alias(__error,error) -strong_alias(__error_at_line,error_at_line) +weak_alias(__error_at_line,error_at_line) -- cgit v1.2.3