Mercurial > emacs
comparison src/unexmacosx.c @ 90016:ff0e824afa37
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-57
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-594
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-598
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-599
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-600
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-602
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-603
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-604
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-609
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-610
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-611
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-614
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-615
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-42
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-43
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-44
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-46
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-48
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49
Add {arch}/=commit-merge-make-log
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50
{arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 14 Oct 2004 08:50:09 +0000 |
parents | 68c22ea6027c 8434603cae5b |
children | f042e7c0fe20 |
comparison
equal
deleted
inserted
replaced
90015:9ee566735998 | 90016:ff0e824afa37 |
---|---|
97 #include <mach-o/loader.h> | 97 #include <mach-o/loader.h> |
98 #include <mach-o/reloc.h> | 98 #include <mach-o/reloc.h> |
99 #if defined (__ppc__) | 99 #if defined (__ppc__) |
100 #include <mach-o/ppc/reloc.h> | 100 #include <mach-o/ppc/reloc.h> |
101 #endif | 101 #endif |
102 #if defined (HAVE_MALLOC_MALLOC_H) | |
103 #include <malloc/malloc.h> | |
104 #else | |
102 #include <objc/malloc.h> | 105 #include <objc/malloc.h> |
106 #endif | |
107 | |
103 | 108 |
104 #define VERBOSE 1 | 109 #define VERBOSE 1 |
105 | 110 |
106 /* Size of buffer used to copy data from the input file to the output | 111 /* Size of buffer used to copy data from the input file to the output |
107 file in function unexec_copy. */ | 112 file in function unexec_copy. */ |