diff options
| author | Miles Bader <miles@gnu.org> | 2006-04-17 08:41:12 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-04-17 08:41:12 +0000 |
| commit | cfc2051d0ed5a268528a647ab0911a2f5cc451de (patch) | |
| tree | cb622fe0b6c1ba8b97314fb80ba2fd8fad60a5a2 /src/unexmacosx.c | |
| parent | ca49cf1703cc20d50653c32ca2f438c8819b78bd (diff) | |
| parent | e4a89ccf738861d7b9c4f611185aa0f204c9c208 (diff) | |
| download | emacs-cfc2051d0ed5a268528a647ab0911a2f5cc451de.tar.gz emacs-cfc2051d0ed5a268528a647ab0911a2f5cc451de.tar.bz2 emacs-cfc2051d0ed5a268528a647ab0911a2f5cc451de.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-56
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 204-225)
- Update from CVS
- Sync from erc--emacs--0
- Merge from gnus--rel--5.10
- Improve tq.el.
- Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.
* gnus--rel--5.10 (patch 81-85)
- Update from CVS
- Merge from emacs--devo--0
Diffstat (limited to 'src/unexmacosx.c')
| -rw-r--r-- | src/unexmacosx.c | 9 |
1 files changed, 6 insertions, 3 deletions
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, |