From: Ivo Timmermans Date: Wed, 3 May 2000 23:00:38 +0000 (+0000) Subject: Don't use error.h or error(), put #error in front of cpp errors. X-Git-Tag: release-1.0pre1~9 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=3d218a31145cf6a4c625ed287cdf3f99e4fd9a03;p=tinc Don't use error.h or error(), put #error in front of cpp errors. --- diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 6cb0b82b..ce1888d8 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -39,7 +39,6 @@ void free (); #endif #define N_(Text) Text -#include "error.h" #include "xalloc.h" #ifndef EXIT_FAILURE @@ -54,11 +53,11 @@ void *xrealloc (void *p, size_t n); #endif #ifndef HAVE_DONE_WORKING_MALLOC_CHECK -you must run the autoconf test for a properly working malloc -- see malloc.m4 +#error you must run the autoconf test for a properly working malloc -- see malloc.m4 #endif #ifndef HAVE_DONE_WORKING_REALLOC_CHECK -you must run the autoconf test for a properly working realloc -- see realloc.m4 +#error you must run the autoconf test for a properly working realloc -- see realloc.m4 #endif /* Exit value when the requested amount of memory is not available. @@ -71,18 +70,13 @@ char *const xalloc_msg_memory_exhausted = N_("Memory exhausted"); /* FIXME: describe */ void (*xalloc_fail_func) (int) = 0; -#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT) -void error (int, int, const char *, ...); -#else -void error (); -#endif - static void xalloc_fail (int size) { if (xalloc_fail_func) (*xalloc_fail_func) (size); - error (xalloc_exit_failure, 0, xalloc_msg_memory_exhausted); + fprintf(stderr, "%s\n", xalloc_msg_memory_exhausted); + exit(xalloc_exit_failure); } /* Allocate N bytes of memory dynamically, with error checking. */