[Emacs-diffs] Changes to emacs/src/unexmacosx.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/unexmacosx.c
diff -u emacs/src/unexmacosx.c:1.17 emacs/src/unexmacosx.c:1.18
--- emacs/src/unexmacosx.c:1.17 Mon Feb  6 15:23:21 2006
+++ emacs/src/unexmacosx.c      Wed Apr 12 08:10:07 2006
@@ -100,7 +100,11 @@
 #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 @@
 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 @@
   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,