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

diff --git a/xmalloc.h b/xmalloc.h
index c6c5317..c94e146 100644
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -3,12 +3,23 @@
 
 #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 *		xmalloc0_inc(size_t, size_t);
 void *		xrealloc(void *, size_t);
 void *		xrealloc_inc(void *, size_t, size_t);
-void		xfree(void *);
+char *		xstrdup(const char *s);
+char *		xstrndup(const char *s, size_t);
+
+#define xfree(ptr)	do { free(ptr); ptr = NULL; } while(0)
 
 #endif