# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1109934549 0
# Node ID f69bf8238a7e297d8903faa1eed1526039b6d290
# Parent  bd59e53ab8e8cc60695e27fb6057c2e16f5d7188
[!MAC_OSX && HAVE_CARBON]: Include Carbon.h.

diff -r bd59e53ab8e8 -r f69bf8238a7e src/macgui.h
--- a/src/macgui.h	Fri Mar 04 11:08:54 2005 +0000
+++ b/src/macgui.h	Fri Mar 04 11:09:09 2005 +0000
@@ -29,10 +29,11 @@
 
 typedef unsigned long Time;
 
-#if MAC_OSX
+#ifdef HAVE_CARBON
+#undef Z
+#ifdef MAC_OSX
 #undef mktime
 #undef DEBUG
-#undef Z
 #undef free
 #undef malloc
 #undef realloc
@@ -44,8 +45,6 @@
 #include <Carbon/Carbon.h>
 #undef mktime
 #define mktime emacs_mktime
-#undef Z
-#define Z (current_buffer->text->z)
 #undef free
 #define free unexec_free
 #undef malloc
@@ -59,12 +58,19 @@
 #undef init_process
 #define init_process emacs_init_process
 #undef INFINITY
-#else
+#else  /* not MAC_OSX */
+#undef SIGHUP
+#define OLDP2C 1
+#include <Carbon.h>
+#endif  /* not MAC_OSX */
+#undef Z
+#define Z (current_buffer->text->z)
+#else /* not HAVE_CARBON */
 #include <QuickDraw.h>		/* for WindowPtr */
 #include <QDOffscreen.h>	/* for GWorldPtr */
 #include <Windows.h>
 #include <Gestalt.h>
-#endif
+#endif /* not HAVE_CARBON */
 
 typedef WindowPtr Window;
 typedef GWorldPtr Pixmap;