X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=xmalloc.h;h=61ea5b5c69df1e6720093961dacfe77b1dc6bec3;hb=baf1c7616dd0a5fa1bafde2045ac2af22d95122a;hp=c6c5317599619153ee9afcd273c2362b7aeb115d;hpb=384a832f989722381d0ad998a87d52f2ce05b714;p=pkg%2Fabook.git

diff --git a/xmalloc.h b/xmalloc.h
index c6c5317..61ea5b5 100644
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -3,12 +3,20 @@
 
 #include <stdlib.h> /* for size_t */
 
+/*
+ * avoid possible collision with readline xmalloc functions
+ */
+
+#define xmalloc		_xmalloc_xmalloc
+#define xrealloc	_xmalloc_xrealloc
+
 void		xmalloc_set_error_handler(void (*)(int));
 void *		xmalloc(size_t);
 void *		xmalloc0(size_t);
 void *		xmalloc_inc(size_t, size_t);
 void *		xrealloc(void *, size_t);
 void *		xrealloc_inc(void *, size_t, size_t);
-void		xfree(void *);
+
+#define xfree(ptr)	do { free(ptr); ptr = NULL; } while(0)
 
 #endif