[PATCH 10/11] Fix warnings in nedmalloc when compiling with GCC 4.4.0
From: Steffen Prohaska <hidden>
Date: 2016-06-15 22:46:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 10/11] Fix warnings in nedmalloc when compiling with GCC 4.4.0 · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 10/11] Fix warnings in nedmalloc when compiling with GCC 4.4.0 · GeunSik Lim <hidden>
- 2016-06-15 · Re: [PATCH 10/11] Fix warnings in nedmalloc when compiling with GCC 4.4.0 · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [PATCH 10/11] Fix warnings in nedmalloc when compiling with GCC 4.4.0 · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 10/11] Fix warnings in nedmalloc when compiling with GCC 4.4.0 · Johannes Schindelin <hidden>
From: Johannes Schindelin <redacted> Signed-off-by: Johannes Schindelin <redacted> Signed-off-by: Steffen Prohaska <redacted> --- compat/nedmalloc/malloc.c.h | 4 +++- 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 1d9bbe0..678beb8 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() if (mparams.magic == 0) init_mparams() #if !ONLY_MSPACES
diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c
index a381a7d..60a4093 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
--
1.6.3.1.54.g99dd