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

diff --git a/src/ChangeLog b/src/ChangeLog
index 2777a1b9218b5e489a25625c2dea35e7786b3016..131586c4e8d9d446f0eae85413638d7894f807c7 100644 (file)
--- 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 cc37606b7131af1695d820d5aff228502bd27752..49095ca4e5afae98101b22d558c7385c475edfbb 100644 (file)
--- 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 9740b3bf3f42efb485f96b8dc1ca8dbb905ab5c1..f7e96b9c1460c4cbb9b7989d32d3e29d6c0d7430 100644 (file)
--- 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 b41c586d2e03999e315dc4001babe87c1528333d..1f2b4c9662098197d113da37b0d1888a41e8c3b5 100644 (file)
--- 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