From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Wed, 12 Apr 2006 08:10:07 +0000 (+0000)
Subject: Include config.h before using HAVE_MALLOC_MALLOC_H.
X-Git-Tag: emacs-pretest-22.0.90~3185
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f900522c43c8b297b9a756a8c9153c1317cbc40;p=emacs.git

Include config.h before using HAVE_MALLOC_MALLOC_H.
(malloc, realloc, free): Add undefs.
(read_load_commands): Remove unused variable `n' and `j'.
(copy_data_segment): Remove unused variable `r'.
---

diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index db77a83cee2..4ca0be829a2 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -100,7 +100,11 @@ Boston, MA 02110-1301, USA.  */
 #if defined (__ppc__)
 #include <mach-o/ppc/reloc.h>
 #endif
-#if defined (HAVE_MALLOC_MALLOC_H)
+#include <config.h>
+#undef malloc
+#undef realloc
+#undef free
+#ifdef HAVE_MALLOC_MALLOC_H
 #include <malloc/malloc.h>
 #else
 #include <objc/malloc.h>
@@ -558,7 +562,7 @@ print_load_command (struct load_command *lc)
 static void
 read_load_commands ()
 {
-  int n, i, j;
+  int i;
 
   if (!unexec_read (&mh, sizeof (struct mach_header)))
     unexec_error ("cannot read mach-o header");
@@ -680,7 +684,6 @@ copy_data_segment (struct load_command *lc)
   struct section *sectp;
   int j;
   unsigned long header_offset, file_offset, old_file_offset;
-  struct region_t *r;
 
   printf ("Writing segment %-16.16s at %#8x - %#8x (sz: %#8x)\n",
 	  scp->segname, scp->fileoff, scp->fileoff + scp->filesize,