diff options
| author | Steven Tamm <steventamm@mac.com> | 2004-10-08 18:38:17 +0000 |
|---|---|---|
| committer | Steven Tamm <steventamm@mac.com> | 2004-10-08 18:38:17 +0000 |
| commit | f7f3a65fc0ce84e01d404230782619edc2bc590a (patch) | |
| tree | d510f8c22be722372a9d756f210ecb7d905f8db8 /src/unexmacosx.c | |
| parent | cef11da29920a67e534b01241c47ee379926210e (diff) | |
| download | emacs-f7f3a65fc0ce84e01d404230782619edc2bc590a.tar.gz emacs-f7f3a65fc0ce84e01d404230782619edc2bc590a.tar.bz2 emacs-f7f3a65fc0ce84e01d404230782619edc2bc590a.zip | |
config.in (HAVE_MALLOC_MALLOC_H): Regenerate
macterm.c (mac_check_for_quit_char): Remove warning for using
NULL where 0 should be used
unexmacosx.c: Use malloc/malloc.h on Tiger instead of
objc/malloc.h
mac.c: Include time.h for Tiger compatibility
Diffstat (limited to 'src/unexmacosx.c')
| -rw-r--r-- | src/unexmacosx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/unexmacosx.c b/src/unexmacosx.c index b41c586d2e0..1f2b4c96620 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -99,7 +99,12 @@ Boston, MA 02111-1307, USA. */ #if defined (__ppc__) #include <mach-o/ppc/reloc.h> #endif +#if defined (HAVE_MALLOC_MALLOC_H) +#include <malloc/malloc.h> +#else #include <objc/malloc.h> +#endif + #define VERBOSE 1 |