summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-05-29 21:24:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-05-29 21:24:02 (GMT)
commit7e2d574c37c6d53f09ceeb650f7af001aa50e987 (patch)
treea68235d36ae82d5401b93ccc2a84c92acaf29cf3 /Makefile
parent2f1ef15070a8664d3194d164f20283d78571e51c (diff)
parent84d32bf7678259c08406571cd6ce4b7a6724dcba (diff)
downloadgit-7e2d574c37c6d53f09ceeb650f7af001aa50e987.zip
git-7e2d574c37c6d53f09ceeb650f7af001aa50e987.tar.gz
git-7e2d574c37c6d53f09ceeb650f7af001aa50e987.tar.bz2
Merge branch 'rj/sparse'
* rj/sparse: sparse: Fix mingw_main() argument number/type errors compat/mingw.c: Fix some sparse warnings compat/win32mmap.c: Fix some sparse warnings compat/poll/poll.c: Fix a sparse warning compat/win32/pthread.c: Fix a sparse warning compat/unsetenv.c: Fix a sparse warning compat/nedmalloc: Fix compiler warnings on linux compat/nedmalloc: Fix some sparse warnings compat/fnmatch/fnmatch.c: Fix a sparse error compat/regex/regexec.c: Fix some sparse warnings
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 77f3f11..7e44b67 100644
--- a/Makefile
+++ b/Makefile
@@ -2003,6 +2003,7 @@ endif
ifdef USE_NED_ALLOCATOR
compat/nedmalloc/nedmalloc.sp compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
-DNDEBUG -DOVERRIDE_STRDUP -DREPLACE_SYSTEM_ALLOCATOR
+compat/nedmalloc/nedmalloc.sp: SPARSE_FLAGS += -Wno-non-pointer-null
endif
git-%$X: %.o GIT-LDFLAGS $(GITLIBS)