From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 12 Sep 2010 20:53:03 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.3-rc2~8
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5879b6bbcaba7696e4abfa717748da166f915405;p=git.git

Merge branch 'maint'

* maint:
  t3101: modernise style
  compat/nedmalloc: don't force NDEBUG on the rest of git

Conflicts:
	Makefile
---

5879b6bbcaba7696e4abfa717748da166f915405
diff --cc Makefile
index c27e8bcc3,38d3bf285..b7a62cfdf
--- a/Makefile
+++ b/Makefile
@@@ -1904,10 -1879,11 +1904,15 @@@ ifdef NO_EXPA
  http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
  endif
  
 +ifdef NO_REGEX
 +compat/regex/regex.o: EXTRA_CPPFLAGS = -DGAWK -DNO_MBSUPPORT
 +endif
 +
+ ifdef USE_NED_ALLOCATOR
+ compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
+ 	-DNDEBUG -DOVERRIDE_STRDUP -DREPLACE_SYSTEM_ALLOCATOR
+ endif
+ 
  git-%$X: %.o $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)