From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 13 Jun 2010 18:21:21 +0000 (-0700)
Subject: Merge branch 'js/try-to-free-stackable'
X-Git-Tag: v1.7.2-rc0~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44e08b003d37440fba6589c07a9573df9d28e6f5;p=git

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
---

44e08b003d37440fba6589c07a9573df9d28e6f5
diff --cc git-compat-util.h
index c0198dde4c,828aadaf3a..81ceb7f906
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -353,17 -344,10 +353,18 @@@ static inline char *gitstrchrnul(const 
  }
  #endif
  
 +#ifndef HAVE_MEMPCPY
 +#define mempcpy gitmempcpy
 +static inline void *gitmempcpy(void *dest, const void *src, size_t n)
 +{
 +	return (char *)memcpy(dest, src, n) + n;
 +}
 +#endif
 +
  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);