Merge remote-tracking branch 'upstream/master' into upstream

[pkg/abook.git] / xmalloc.h

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