diff options
| author | Richard Biener <rguenther@suse.de> | 2019-11-04 14:05:24 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2019-11-04 14:05:24 +0000 |
| commit | 6fb349540ce6464e9222d4c236a2c43a174d058b (patch) | |
| tree | 3e98900b6ea727f70412a326d7bbd6f069a1160d /gcc | |
| parent | 253f29f1adefd9bc9808addd4498e6b9cea7827b (diff) | |
| download | gcc-6fb349540ce6464e9222d4c236a2c43a174d058b.zip gcc-6fb349540ce6464e9222d4c236a2c43a174d058b.tar.gz gcc-6fb349540ce6464e9222d4c236a2c43a174d058b.tar.bz2 | |
system.h: Include malloc.h if INCLUDE_MALLOC_H and HAVE_MALLINFO.
2019-11-04 Richard Biener <rguenther@suse.de>
* 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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ggc-common.c | 4 | ||||
| -rw-r--r-- | gcc/system.h | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1b99947..b53c793 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-11-04 Richard Biener <rguenther@suse.de> + + * 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 <dje.gcc@gmail.com> * ggc-common.c: Include system.h before malloc.h. diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c index 0841a0a..a7edb15 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 <malloc.h> -#endif #include "coretypes.h" #include "timevar.h" #include "diagnostic-core.h" diff --git a/gcc/system.h b/gcc/system.h index 56af544..3ef668f 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 <malloc.h> +#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 *) |