MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eliminate global #include of "mmalloc.h".

Browse Source
This commit is contained in:
Andrew Cagney 2001-12-06 20:59:11 +00:00
parent 31e9866ea6
commit ed1801dfff
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,3 +1,12 @@
2001-12-06 Andrew Cagney <ac131313@redhat.com>
* defs.h: Do not include "mmalloc.h".
(mcalloc, mmalloc, mrealloc, mfree): Delete declaration.
* objfiles.c: Include "mmalloc.h".
* utils.c: Include "mmalloc.h".
(mmalloc, mfree, mrealloc, mmalloc): Make static, change PTR to
void pointer.
2001-12-06 Andrew Cagney <ac131313@redhat.com>
* regcache.c (store_register, fetch_register): Only use

14
gdb/defs.h
View File

@ -59,10 +59,6 @@
#include "progress.h"
#ifdef USE_MMALLOC
#include "mmalloc.h"
#endif
/* For BFD64 and bfd_vma. */
#include "bfd.h"
@ -1029,16 +1025,6 @@ extern char *msavestring (void *, const char *, size_t);
extern char *mstrsave (void *, const char *);
#if !defined (USE_MMALLOC)
/* NOTE: cagney/2000-03-04: The mmalloc functions need to use PTR
rather than void* so that they are consistent with the delcaration
in ../mmalloc/mmalloc.h. */
extern PTR mcalloc (PTR, size_t, size_t);
extern PTR mmalloc (PTR, size_t);
extern PTR mrealloc (PTR, PTR, size_t);
extern void mfree (PTR, PTR);
#endif
/* Robust versions of same. Throw an internal error when no memory,
guard against stray NULL arguments. */
extern void *xmmalloc (void *md, size_t size);

2
gdb/objfiles.c
View File

@ -43,6 +43,8 @@
#if defined(USE_MMALLOC) && defined(HAVE_MMAP)
#include "mmalloc.h"
static int open_existing_mapped_file (char *, long, int);
static int open_mapped_file (char *filename, long mtime, int flags);

20
gdb/utils.c
View File

@ -56,6 +56,10 @@
#include <readline/readline.h>
#ifdef USE_MMALLOC
#include "mmalloc.h"
#endif
#ifndef MALLOC_INCOMPATIBLE
#ifdef NEED_DECLARATION_MALLOC
extern PTR malloc ();
@ -893,14 +897,14 @@ request_quit (int signo)
/* NOTE: These must use PTR so that their definition matches the
declaration found in "mmalloc.h". */
PTR
mmalloc (PTR md, size_t size)
static void *
mmalloc (void *md, size_t size)
{
return malloc (size); /* NOTE: GDB's only call to malloc() */
}
PTR
mrealloc (PTR md, PTR ptr, size_t size)
static void *
mrealloc (void *md, void *ptr, size_t size)
{
if (ptr == 0) /* Guard against old realloc's */
return mmalloc (md, size);
@ -908,14 +912,14 @@ mrealloc (PTR md, PTR ptr, size_t size)
return realloc (ptr, size); /* NOTE: GDB's only call to ralloc() */
}
PTR
mcalloc (PTR md, size_t number, size_t size)
static void *
mcalloc (void *md, size_t number, size_t size)
{
return calloc (number, size); /* NOTE: GDB's only call to calloc() */
}
void
mfree (PTR md, PTR ptr)
static void
mfree (void *md, void *ptr)
{
free (ptr); /* NOTE: GDB's only call to free() */
}