X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Fxmalloc.c;h=38fb571a254e52b890979ea7bd0ed9cd287463c6;hp=6cb0b82bff7120167086018344875596f460e4c5;hb=6182664859383a86a47846cafdc1f6fcd73b5a76;hpb=baebae274913d912d76ba1d545f337dfb945fc5c

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 6cb0b82b..38fb571a 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -20,6 +20,7 @@
 #endif
 
 #include <sys/types.h>
+#include <stdio.h>
 
 #if STDC_HEADERS
 # include <stdlib.h>
@@ -39,7 +40,6 @@ void free ();
 #endif
 #define N_(Text) Text
 
-#include "error.h"
 #include "xalloc.h"
 
 #ifndef EXIT_FAILURE
@@ -54,11 +54,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 +71,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.  */