From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 4 Mar 2005 11:09:33 +0000 (+0000)
Subject: [TARGET_API_MAC_CARBON]: Don't include headers that are included via
X-Git-Tag: ttn-vms-21-2-B4~2021
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=04b5475bff56f8c57c6c4fe04d4e9b4555f53d26;p=emacs.git

[TARGET_API_MAC_CARBON]: Don't include headers that are included via
Carbon.h.
---

diff --git a/src/macmenu.c b/src/macmenu.c
index f0696a49774..35615cc3796 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA.  */
 #include "charset.h"
 #include "coding.h"
 
-#ifndef MAC_OSX
+#if !TARGET_API_MAC_CARBON
 #include <MacTypes.h>
 #include <Menus.h>
 #include <QuickDraw.h>
@@ -47,7 +47,7 @@ Boston, MA 02111-1307, USA.  */
 #if defined (__MRC__) || (__MSL__ >= 0x6000)
 #include <ControlDefinitions.h>
 #endif
-#endif /* not MAC_OSX */
+#endif /* not TARGET_API_MAC_CARBON */
 
 /* This may include sys/types.h, and that somehow loses
    if this is not done before the other system files.  */