Skip to content

Commit 67b7dd3

Browse files
committed
Merge branch 'rj/sparse-updates' into maint
Devtool update. * rj/sparse-updates: Makefile: suppress a sparse warning for pack-revindex.c config.mak.uname: remove SPARSE_FLAGS setting for cygwin
2 parents 2e1062d + 54360a1 commit 67b7dd3

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2176,6 +2176,8 @@ gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
21762176
http-push.sp http.sp http-walker.sp remote-curl.sp imap-send.sp: SPARSE_FLAGS += \
21772177
-DCURL_DISABLE_TYPECHECK
21782178

2179+
pack-revindex.sp: SPARSE_FLAGS += -Wno-memcpy-max-count
2180+
21792181
ifdef NO_EXPAT
21802182
http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
21812183
endif

config.mak.uname

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ ifeq ($(uname_O),Cygwin)
182182
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
183183
X = .exe
184184
UNRELIABLE_FSTAT = UnfortunatelyYes
185-
SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
186185
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
187186
MMAP_PREVENTS_DELETE = UnfortunatelyYes
188187
COMPAT_OBJS += compat/cygwin.o

0 commit comments

Comments
 (0)