diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:41 -0700 |
| commit | 403192acb6e5f4b2c590ca206acc2a7420ef86a7 (patch) | |
| tree | 0083f85df71b79e1258f13210e6b74a7ca01d15c /compat | |
| parent | df0c308c1a165e277ef3a7b8ae1457b926936d99 (diff) | |
| parent | 6a8cbc41bacb853e723b1ae3fcc2277535d2ba52 (diff) | |
| download | git-403192acb6e5f4b2c590ca206acc2a7420ef86a7.tar.gz | |
Merge branch 'cb/pedantic-build-for-developers'
Update the build procedure to use the "-pedantic" build when
DEVELOPER makefile macro is in effect.
* cb/pedantic-build-for-developers:
developer: enable pedantic by default
win32: allow building with pedantic mode enabled
gettext: remove optional non-standard parens in N_() definition
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/nedmalloc/nedmalloc.c | 2 | ||||
| -rw-r--r-- | compat/win32/lazyload.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c index 1cc31c3502..edb438a777 100644 --- 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 index 9e631c8593..d2056cdadf 100644 --- 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) { |