Merge branch 'rj/sparse'

diff --git a/Makefile b/Makefile
index 77f3f117c4ae8bf24cbd40758874b5c4d03141d5..7e44b67599daeae05526ea0d876233b7014cbc83 100644 (file)
--- 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)