win32: allow building with pedantic mode enabled

carenas · gitster · commit 27e0c3c6cfea · 2021-09-03T11:40:30.000-07:00
In preparation to building with pedantic mode enabled, change a couple
of places where the current mingw gcc compiler provided with the SDK
reports issues.

A full fix for the incompatible use of (void *) to store function
pointers has been punted, with the minimal change to instead use a
generic function pointer (FARPROC), and therefore the (hopefully)
temporary need to disable incompatible pointer warnings.

Signed-off-by: Carlo Marcelo Arenas Belón &lt;carenas@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c
@@ -510,7 +510,7 @@ static void threadcache_free(nedpool *p, threadcache *tc, int mymspace, void *me
 	assert(idx<=THREADCACHEMAXBINS);
 	if(tck==*binsptr)
 	{
-		fprintf(stderr, "Attempt to free already freed memory block %p - aborting!\n", tck);
+		fprintf(stderr, "Attempt to free already freed memory block %p - aborting!\n", (void *)tck);
 		abort();
 	}
 #ifdef FULLSANITYCHECKS
diff --git a/compat/win32/lazyload.h b/compat/win32/lazyload.h
@@ -37,7 +37,7 @@ struct proc_addr {
 #define INIT_PROC_ADDR(function) \
 	(function = get_proc_addr(&proc_addr_##function))
 
-static inline void *get_proc_addr(struct proc_addr *proc)
+static inline FARPROC get_proc_addr(struct proc_addr *proc)
 {
 	/* only do this once */
 	if (!proc->initialized) {
diff --git a/config.mak.dev b/config.mak.dev
@@ -1,11 +1,18 @@
+ifndef COMPILER_FEATURES
+COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
+endif
+
 ifeq ($(filter no-error,$(DEVOPTS)),)
 DEVELOPER_CFLAGS += -Werror
 SPARSE_FLAGS += -Wsparse-error
 endif
+DEVELOPER_CFLAGS += -Wall
 ifneq ($(filter pedantic,$(DEVOPTS)),)
 DEVELOPER_CFLAGS += -pedantic
+ifneq ($(filter gcc5,$(COMPILER_FEATURES)),)
+DEVELOPER_CFLAGS += -Wno-incompatible-pointer-types
+endif
 endif
-DEVELOPER_CFLAGS += -Wall
 DEVELOPER_CFLAGS += -Wdeclaration-after-statement
 DEVELOPER_CFLAGS += -Wformat-security
 DEVELOPER_CFLAGS += -Wold-style-definition
@@ -16,10 +23,6 @@ DEVELOPER_CFLAGS += -Wunused
 DEVELOPER_CFLAGS += -Wvla
 DEVELOPER_CFLAGS += -fno-common
 
-ifndef COMPILER_FEATURES
-COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
-endif
-
 ifneq ($(filter clang4,$(COMPILER_FEATURES)),)
 DEVELOPER_CFLAGS += -Wtautological-constant-out-of-range-compare
 endif

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ static void threadcache_free(nedpool p, threadcache tc, int mymspace, void *me`
`510`	`510`	`assert(idx<=THREADCACHEMAXBINS);`
`511`	`511`	`if(tck==*binsptr)`
`512`	`512`	`{`
`513`		`- fprintf(stderr, "Attempt to free already freed memory block %p - aborting!\n", tck);`
	`513`	`+ fprintf(stderr, "Attempt to free already freed memory block %p - aborting!\n", (void *)tck);`
`514`	`514`	`abort();`
`515`	`515`	`}`
`516`	`516`	`#ifdef FULLSANITYCHECKS`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ struct proc_addr {`
`37`	`37`	`#define INIT_PROC_ADDR(function) \`
`38`	`38`	`(function = get_proc_addr(&proc_addr_##function))`
`39`	`39`
`40`		`-static inline void get_proc_addr(struct proc_addr proc)`
	`40`	`+static inline FARPROC get_proc_addr(struct proc_addr *proc)`
`41`	`41`	`{`
`42`	`42`	`/* only do this once */`
`43`	`43`	`if (!proc->initialized) {`