Commit 5673434fff718d93ac738a03403442f16abeecba
2008-12-31T07:34:43
Undefine malloc,strdup,calloc before redefining them Some systems may use cpp macros to define these functions, glibc appears to be one of them. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
diff --git a/src/util.h b/src/util.h
index f09aecf..f269af4 100644
--- a/src/util.h
+++ b/src/util.h
@@ -9,8 +9,20 @@ extern char *git__strdup(const char *);
#ifndef GIT__NO_HIDE_MALLOC
# define GIT__FORBID_MALLOC do_not_use_malloc_directly
+
+# ifdef malloc
+# undef malloc
+# endif
# define malloc(a) GIT__FORBID_MALLOC
+
+# ifdef calloc
+# undef calloc
+# endif
# define calloc(a,b) GIT__FORBID_MALLOC
+
+# ifdef strdup
+# undef strdup
+# endif
# define strdup(a) GIT__FORBID_MALLOC
#endif