diff options
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/config.in | 9 | ||||
| -rw-r--r-- | src/mac.c | 1 | ||||
| -rw-r--r-- | src/unexmacosx.c | 5 |
4 files changed, 21 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2777a1b9218..131586c4e8d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 diff --git a/src/config.in b/src/config.in index cc37606b713..49095ca4e5a 100644 --- a/src/config.in +++ b/src/config.in @@ -352,6 +352,9 @@ Boston, MA 02111-1307, USA. */ /* 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 @@ Boston, MA 02111-1307, USA. */ /* 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. */ diff --git a/src/mac.c b/src/mac.c index 9740b3bf3f4..f7e96b9c146 100644 --- a/src/mac.c +++ b/src/mac.c @@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA. */ #include <stdio.h> #include <errno.h> +#include <time.h> #include <utime.h> #include <dirent.h> #include <sys/types.h> 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 |