undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings in nedmalloc when compiling with GCC 4.4.0

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2009-06-08 16:46:49 +02:00 committed by Junio C Hamano
parent f0ed8226c9
commit a21077e75f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compat/nedmalloc/malloc.c.h
View File

@ -1270,7 +1270,9 @@ int mspace_mallopt(int, int);
/*------------------------------ internal #includes ---------------------- */ /*------------------------------ internal #includes ---------------------- */
#ifdef WIN32 #ifdef WIN32
#ifndef __GNUC__
#pragma warning( disable : 4146 ) /* no "unsigned" warnings */ #pragma warning( disable : 4146 ) /* no "unsigned" warnings */
#endif
#endif /* WIN32 */ #endif /* WIN32 */
#include <stdio.h> /* for printing in malloc_stats */ #include <stdio.h> /* for printing in malloc_stats */
@ -2541,7 +2543,7 @@ struct malloc_params {
static struct malloc_params mparams; static struct malloc_params mparams;
/* Ensure mparams initialized */ /* Ensure mparams initialized */
#define ensure_initialization() (mparams.magic != 0 || init_mparams()) #define ensure_initialization() ((void)(mparams.magic == 0 || init_mparams()))
#if !ONLY_MSPACES #if !ONLY_MSPACES

2
compat/nedmalloc/nedmalloc.c
View File

@ -34,7 +34,7 @@ DEALINGS IN THE SOFTWARE.
/*#define FULLSANITYCHECKS*/ /*#define FULLSANITYCHECKS*/
#include "nedmalloc.h" #include "nedmalloc.h"
#if defined(WIN32) && !defined(__MINGW32__) #if defined(WIN32)
#include <malloc.h> #include <malloc.h>
#endif #endif
#define MSPACES 1 #define MSPACES 1