From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Feb 2018 21:34:31 +0000 (-0800)
Subject: Merge branch 'rj/sparse-updates' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/072df8ed5b9ed549fd5417d793c8268b04dd4fdc?hp=a7a24f5f29bbfa73a8a1a84af8fecda5cd583df8

Merge branch 'rj/sparse-updates' into next

Devtool update.

* rj/sparse-updates:
Makefile: suppress a sparse warning for pack-revindex.c
config.mak.uname: remove SPARSE_FLAGS setting for cygwin
---

diff --git a/Makefile b/Makefile
index c56fdc14ca..f6d9523b95 100644
--- a/Makefile
+++ b/Makefile
@@ -2162,6 +2162,8 @@ gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
 http-push.sp http.sp http-walker.sp remote-curl.sp imap-send.sp: SPARSE_FLAGS += \
 	-DCURL_DISABLE_TYPECHECK
 
+pack-revindex.sp: SPARSE_FLAGS += -Wno-memcpy-max-count
+
 ifdef NO_EXPAT
 http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
 endif
diff --git a/config.mak.uname b/config.mak.uname
index 685a80d138..6a1d0de0cc 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -182,7 +182,6 @@ ifeq ($(uname_O),Cygwin)
 	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
 	X = .exe
 	UNRELIABLE_FSTAT = UnfortunatelyYes
-	SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
 	OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
 	MMAP_PREVENTS_DELETE = UnfortunatelyYes
 	COMPAT_OBJS += compat/cygwin.o