Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used

[git.git] / git-compat-util.h

diff --git a/git-compat-util.h b/git-compat-util.h
index aff627a85a812bb782e68cd27d06eb42d7dac537..828aadaf3ae0bdd41ed3d2966ab36c5a73ca91ab 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -178,6 +178,9 @@ extern char *gitbasename(char *);
 #ifdef __GNUC__
 #define NORETURN __attribute__((__noreturn__))
 #define NORETURN_PTR __attribute__((__noreturn__))
+#elif defined(_MSC_VER)
+#define NORETURN __declspec(noreturn)
+#define NORETURN_PTR
 #else
 #define NORETURN
 #define NORETURN_PTR
@@ -343,8 +346,12 @@ static inline char *gitstrchrnul(const char *s, int c)
 
 extern void release_pack_memory(size_t, int);
 
+typedef void (*try_to_free_t)(size_t);
+extern try_to_free_t set_try_to_free_routine(try_to_free_t);
+
 extern char *xstrdup(const char *str);
 extern void *xmalloc(size_t size);
+extern void *xmallocz(size_t size);
 extern void *xmemdupz(const void *data, size_t len);
 extern char *xstrndup(const char *str, size_t len);
 extern void *xrealloc(void *ptr, size_t size);