diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2009-06-08 16:46:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-08 09:43:37 -0700 |
| commit | a21077e75f55b4696ada33d7d09f016f4ef16167 (patch) | |
| tree | 66e864b7e2b6324c08c5e9786f4f59cfb1031599 /compat/nedmalloc | |
| parent | f0ed8226c9c65f2a324610258418258229e77fbe (diff) | |
| download | git-a21077e75f55b4696ada33d7d09f016f4ef16167.tar.gz | |
Fix warnings in nedmalloc when compiling with GCC 4.4.0
Nedmalloc's source code has a cute #define construct to avoid inserting
an if() statement, because that might interact badly with enclosing if()
statements. However, GCC > 4 complains with a "warning: value computed
is not used". So we cast the result to "void".
GCC also does not understand the Visual C++ specific pragmas, so we need
to disable them for MinGW.
We need to include malloc.h on Windows even if we happen to compile the
stuff as a MinGW program. Otherwise the function declaration of alloca()
is missing.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/nedmalloc')
| -rw-r--r-- | compat/nedmalloc/malloc.c.h | 4 | ||||
| -rw-r--r-- | compat/nedmalloc/nedmalloc.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h index bb0f482d9f..b5b1495c7e 100644 --- a/compat/nedmalloc/malloc.c.h +++ b/compat/nedmalloc/malloc.c.h @@ -1270,7 +1270,9 @@ int mspace_mallopt(int, int); /*------------------------------ internal #includes ---------------------- */ #ifdef WIN32 +#ifndef __GNUC__ #pragma warning( disable : 4146 ) /* no "unsigned" warnings */ +#endif #endif /* WIN32 */ #include <stdio.h> /* for printing in malloc_stats */ @@ -2541,7 +2543,7 @@ struct malloc_params { static struct malloc_params mparams; /* Ensure mparams initialized */ -#define ensure_initialization() (mparams.magic != 0 || init_mparams()) +#define ensure_initialization() ((void)(mparams.magic == 0 || init_mparams())) #if !ONLY_MSPACES diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c index 41a3234e4e..d9a17a8057 100644 --- a/compat/nedmalloc/nedmalloc.c +++ b/compat/nedmalloc/nedmalloc.c @@ -34,7 +34,7 @@ DEALINGS IN THE SOFTWARE. /*#define FULLSANITYCHECKS*/ #include "nedmalloc.h" -#if defined(WIN32) && !defined(__MINGW32__) +#if defined(WIN32) #include <malloc.h> #endif #define MSPACES 1 |