global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-02 13:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings in nedmalloc when compiling with GCC 4.4.0

Browse Source 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2009-05-07 14:30:33 +02:00
parent 021a33d854
commit 4f372b5e30
2 changed files with 4 additions and 2 deletions
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 ---------------------- */
#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() if (mparams.magic == 0) init_mparams()
#if !ONLY_MSPACES

2
compat/nedmalloc/nedmalloc.c
View File

@@ -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