diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-11 10:21:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-11 10:21:47 -0700 |
| commit | 4ae0bc75f97bffec786460b5eaace29d2935487b (patch) | |
| tree | 46b6e7d216ff716fd25b60ac3da4a000900148bd /config.mak.dev | |
| parent | ed4d5353426e9e61360ea68e28140fbeb55eeb9e (diff) | |
| parent | ebd2e4a13a05852fd30dd5ed8aa018c14000a161 (diff) | |
| download | git-4ae0bc75f97bffec786460b5eaace29d2935487b.tar.xz | |
Merge branch 'js/win-lazyload-buildfix'
Compilation fix.
* js/win-lazyload-buildfix:
Makefile: restrict -Wpedantic and -Wno-pedantic-ms-format better
lazyload.h: use an even more generic function pointer than FARPROC
lazyload.h: fix warnings about mismatching function pointer types
Diffstat (limited to 'config.mak.dev')
| -rw-r--r-- | config.mak.dev | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config.mak.dev b/config.mak.dev index c080ac0231..7673fed114 100644 --- a/config.mak.dev +++ b/config.mak.dev @@ -6,13 +6,17 @@ ifeq ($(filter no-error,$(DEVOPTS)),) DEVELOPER_CFLAGS += -Werror SPARSE_FLAGS += -Wsparse-error endif + DEVELOPER_CFLAGS += -Wall ifeq ($(filter no-pedantic,$(DEVOPTS)),) DEVELOPER_CFLAGS += -pedantic +ifneq (($or $(filter gcc5,$(COMPILER_FEATURES)),$(filter clang4,$(COMPILER_FEATURES))),) DEVELOPER_CFLAGS += -Wpedantic -ifneq ($(filter gcc5,$(COMPILER_FEATURES)),) +ifneq ($(filter gcc10,$(COMPILER_FEATURES)),) +ifeq ($(uname_S),MINGW) DEVELOPER_CFLAGS += -Wno-pedantic-ms-format -DEVELOPER_CFLAGS += -Wno-incompatible-pointer-types +endif +endif endif endif DEVELOPER_CFLAGS += -Wdeclaration-after-statement |