From 19c3f20809aa8eed924084b45c5390674cfdbbbc Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 29 Jan 1996 16:05:21 +0000 Subject: Thu Jan 25 21:10:39 1996 Andreas Schwab * db/Makefile (subdir-dirs): Renamed from dbdirs. * Makerules (distinfo-vars): Add subdir-dirs. * MakeTAGS: Remove vpath directives. (all-dirs): Prepend $(subdir-dirs). (all-sources, all-headers): Use wildcard to find sources. Thu Jan 25 21:10:39 1996 Andreas Schwab * db/Makefile (subdir-dirs): Renamed from dbdirs. * Makerules (distinfo-vars): Add subdir-dirs. * MakeTAGS: Remove vpath directives. (all-dirs): Prepend $(subdir-dirs). (all-sources, all-headers): Use wildcard to find sources. Mon Jan 29 10:44:38 1996 Roland McGrath * malloc/Makefile (CFLAGS-vm-limit.c, CFLAGS-ralloc.c): New variables. * mach/msgserver.c: Declare DEMUX arg with prototype. --- misc/error.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'misc/error.h') diff --git a/misc/error.h b/misc/error.h index 40b345b..749dce4 100644 --- a/misc/error.h +++ b/misc/error.h @@ -1,5 +1,5 @@ /* error.h -- declaration for error-reporting function - Copyright (C) 1995 Software Foundation, Inc. + Copyright (C) 1995, 1996 Software Foundation, Inc. This file is part of the GNU C Library. Its master source is NOT part of the C library, however. The master source lives in /gd/gnu/lib. @@ -35,11 +35,23 @@ Cambridge, MA 02139, USA. */ # endif #endif -#if __STDC__ -void error (int, int, const char *, ...) \ - __attribute__ ((__format__ (__printf__, 3, 4))); +#if defined (__STDC__) && __STDC__ + +/* Print a message with `fprintf (stderr, FORMAT, ...)'; + if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). + If STATUS is nonzero, terminate the program with `exit (STATUS)'. */ + +extern void error (int status, int errnum, const char *format, ...) + __attribute__ ((__format__ (__printf__, 3, 4))); + +/* If NULL, error will flush stdout, then print on stderr the program + name, a colon and a space. Otherwise, error will call this + function without parameters instead. */ +extern void (*error_print_progname) (void); + #else void error (); +extern void (*error_print_progname) (); #endif /* This variable is incremented each time `error' is called. */ -- cgit v1.1