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
fetch/store pseudo-register when function is present. Assume
target can handle all registers.
#include "progress.h"
-#ifdef USE_MMALLOC
-#include "mmalloc.h"
-#endif
-
/* For BFD64 and bfd_vma. */
#include "bfd.h"
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);
#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);
#include <readline/readline.h>
+#ifdef USE_MMALLOC
+#include "mmalloc.h"
+#endif
+
#ifndef MALLOC_INCOMPATIBLE
#ifdef NEED_DECLARATION_MALLOC
extern PTR malloc ();
/* 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);
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() */
}