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
This commit is contained in:
Richard Biener 2019-11-04 14:05:24 +00:00 committed by Richard Biener
parent 253f29f1ad
commit 6fb349540c
3 changed files with 12 additions and 3 deletions

View File

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

View File

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

View File

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