summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-13 18:21:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-13 18:21:21 (GMT)
commit44e08b003d37440fba6589c07a9573df9d28e6f5 (patch)
treef663e002f1183cf7330b5f34e16b44096ebeb72f /git-compat-util.h
parent57af58e888165db623925f25e290f1b9472fd5c9 (diff)
parent3a0942598ce33b195bfaaf250b2da23e4eceb3c6 (diff)
downloadgit-44e08b003d37440fba6589c07a9573df9d28e6f5.zip
git-44e08b003d37440fba6589c07a9573df9d28e6f5.tar.gz
git-44e08b003d37440fba6589c07a9573df9d28e6f5.tar.bz2
Merge branch 'js/try-to-free-stackable'
* js/try-to-free-stackable: Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used Have set_try_to_free_routine return the previous routine
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index c0198dd..81ceb7f 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -363,7 +363,8 @@ static inline void *gitmempcpy(void *dest, const void *src, size_t n)
extern void release_pack_memory(size_t, int);
-extern void set_try_to_free_routine(void (*routine)(size_t));
+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);