diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:19 -0700 |
| commit | 67b7dd3d86eeb3464cd65c296d54596e2b15e72b (patch) | |
| tree | 4b32d90144804f203d66090e26551c2993a124b8 | |
| parent | 2e1062d30fe963fd3313ee32aef2291195194f06 (diff) | |
| parent | 54360a19566f38b6d21dfd9e77ca0cc62b60ad84 (diff) | |
| download | git-67b7dd3d86eeb3464cd65c296d54596e2b15e72b.tar.gz | |
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
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | config.mak.uname | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -2176,6 +2176,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 |