#ifndef MUTT_LIB_LIB_MEM_H
#define MUTT_LIB_LIB_MEM_H
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
#define ssizeof(foo) (ssize_t)sizeof(foo)
#define countof(foo) (ssizeof(foo) / ssizeof(foo[0]))
#define p_dupstr(p, len) xmemdupstr((p), (len))
#define p_realloc(pp, count) xrealloc((void*)(pp), sizeof(**(pp)) * (count))
+#define p_alloc_nr(x) (((x) + 16) * 3 / 2)
+
+#define p_allocgrow(pp, goalnb, allocnb) \
+ do { \
+ if ((goalnb) > *(allocnb)) { \
+ if (p_alloc_nr(*(allocnb)) < (goalnb)) { \
+ *(allocnb) = (goalnb); \
+ } else { \
+ *(allocnb) = p_alloc_nr(*(allocnb)); \
+ } \
+ p_realloc(pp, *(allocnb)); \
+ } \
+ } while (0)
+
#ifdef __GNUC__
# define p_delete(mem_pp) \