From 6fb349540ce6464e9222d4c236a2c43a174d058b Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 4 Nov 2019 14:05:24 +0000 Subject: [PATCH] system.h: Include malloc.h if INCLUDE_MALLOC_H and HAVE_MALLINFO. 2019-11-04 Richard Biener * system.h: Include malloc.h if INCLUDE_MALLOC_H and HAVE_MALLINFO. * ggc-common.c: Remove inclusion of malloc.h, define INCLUDE_MALLOC_H. From-SVN: r277779 --- gcc/ChangeLog | 5 +++++ gcc/ggc-common.c | 4 +--- gcc/system.h | 6 ++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1b99947db22..b53c793d6c2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-11-04 Richard Biener + + * system.h: Include malloc.h if INCLUDE_MALLOC_H and HAVE_MALLINFO. + * ggc-common.c: Remove inclusion of malloc.h, define INCLUDE_MALLOC_H. + 2019-11-04 David Edelsohn * ggc-common.c: Include system.h before malloc.h. diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c index 0841a0ab6c4..a7edb1591f8 100644 --- a/gcc/ggc-common.c +++ b/gcc/ggc-common.c @@ -21,10 +21,8 @@ along with GCC; see the file COPYING3. If not see any particular GC implementation. */ #include "config.h" +#define INCLUDE_MALLOC_H #include "system.h" -#ifdef HAVE_MALLINFO -#include -#endif #include "coretypes.h" #include "timevar.h" #include "diagnostic-core.h" diff --git a/gcc/system.h b/gcc/system.h index 56af544b70b..3ef668f5508 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -730,6 +730,12 @@ extern int vsnprintf (char *, size_t, const char *, va_list); # include "unique-ptr.h" #endif +#ifdef INCLUDE_MALLOC_H +#ifdef HAVE_MALLINFO +#include +#endif +#endif + /* Redefine abort to report an internal error w/o coredump, and reporting the location of the error in the source file. */ extern void fancy_abort (const char *, int, const char *)