2006-12-19 00:17:06 +01:00
|
|
|
--- lib/error.c
|
2007-12-12 18:16:54 +01:00
|
|
|
+++ lib/error.c 2007-12-07 18:50:29.332479427 +0100
|
|
|
|
@@ -76,12 +76,15 @@ private_strerror (errnum)
|
2006-12-19 00:17:06 +01:00
|
|
|
#define strerror private_strerror
|
|
|
|
#endif
|
|
|
|
|
|
|
|
+#include "lib/error.h"
|
|
|
|
+
|
|
|
|
/* Print the program name and error message MESSAGE, which is a printf-style
|
|
|
|
format string with optional args.
|
|
|
|
If ERRNUM is nonzero, print its corresponding system error message.
|
|
|
|
Exit with status STATUS if it is nonzero. */
|
|
|
|
/* VARARGS */
|
|
|
|
|
|
|
|
+#ifndef __GLIBC__ /* glibc exports this function */
|
|
|
|
void
|
|
|
|
#if defined(VA_START) && __STDC__
|
|
|
|
error (int status, int errnum, const char *message, ...)
|
2007-12-12 18:16:54 +01:00
|
|
|
@@ -137,3 +140,4 @@ error (status, errnum, message, va_alist
|
2006-12-19 00:17:06 +01:00
|
|
|
exit (status);
|
2007-12-12 18:16:54 +01:00
|
|
|
}
|
2006-12-19 00:17:06 +01:00
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
--- lib/error.h
|
2007-12-12 18:16:54 +01:00
|
|
|
+++ lib/error.h 2007-12-07 18:51:53.803262466 +0100
|
|
|
|
@@ -29,9 +29,9 @@ extern int errno;
|
|
|
|
#include "manconfig.h"
|
2006-12-19 00:17:06 +01:00
|
|
|
|
|
|
|
#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
|
2007-12-12 18:16:54 +01:00
|
|
|
-void error (int, int, const char *, ...) ATTRIBUTE_FORMAT_PRINTF(3, 4);
|
|
|
|
+extern void error (int, int, const char *, ...) ATTRIBUTE_FORMAT_PRINTF(3, 4);
|
2006-12-19 00:17:06 +01:00
|
|
|
#else
|
|
|
|
-void error ();
|
|
|
|
+extern void error ();
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|