Mercurial > emacs
changeset 57397:8434603cae5b
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
| author | Steven Tamm <steventamm@mac.com> |
|---|---|
| date | Fri, 08 Oct 2004 18:38:17 +0000 |
| parents | f95883a41a23 |
| children | 29ed8cef77f8 |
| files | src/ChangeLog src/config.in src/mac.c src/unexmacosx.c |
| diffstat | 4 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Oct 08 18:36:47 2004 +0000 +++ b/src/ChangeLog Fri Oct 08 18:38:17 2004 +0000 @@ -1,3 +1,12 @@ +2004-10-08 Steven Tamm <steventamm@mac.com> + + * 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 + 2004-10-07 Kim F. Storm <storm@cua.dk> * xdisp.c (redisplay_window): Fix flicker on vertical line between
--- a/src/config.in Fri Oct 08 18:36:47 2004 +0000 +++ b/src/config.in Fri Oct 08 18:38:17 2004 +0000 @@ -352,6 +352,9 @@ /* Define to 1 if you have the <maillock.h> header file. */ #undef HAVE_MAILLOCK_H +/* Define to 1 if you have the <malloc/malloc.h> header file. */ +#undef HAVE_MALLOC_MALLOC_H + /* Define to 1 if you have the `mblen' function. */ #undef HAVE_MBLEN @@ -754,9 +757,9 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION /* Define to 1 if you have the ANSI C header files. */
--- a/src/mac.c Fri Oct 08 18:36:47 2004 +0000 +++ b/src/mac.c Fri Oct 08 18:38:17 2004 +0000 @@ -24,6 +24,7 @@ #include <stdio.h> #include <errno.h> +#include <time.h> #include <utime.h> #include <dirent.h> #include <sys/types.h>
--- a/src/unexmacosx.c Fri Oct 08 18:36:47 2004 +0000 +++ b/src/unexmacosx.c Fri Oct 08 18:38:17 2004 +0000 @@ -99,7 +99,12 @@ #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