From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 4 Mar 2005 11:06:42 +0000 (+0000)
Subject: (main): Change `#ifdef HAVE_CARBON' to `#if defined (MAC_OSX) &&
X-Git-Tag: ttn-vms-21-2-B4~2026
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ec33130452a969bf164f29279e84b2314a04eb5;p=emacs.git

(main): Change `#ifdef HAVE_CARBON' to `#if defined (MAC_OSX) &&
defined (HAVE_CARBON)'.
---

diff --git a/src/emacs.c b/src/emacs.c
index 75196d83159..eef51a56967 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1482,7 +1482,7 @@ main (argc, argv
   init_ntproc ();	/* must precede init_editfns.  */
 #endif
 
-#ifdef HAVE_CARBON
+#if defined (MAC_OSX) && defined (HAVE_CARBON)
   if (initialized)
     init_mac_osx_environment ();
 #endif
@@ -1626,12 +1626,12 @@ main (argc, argv
       syms_of_fontset ();
 #endif /* HAVE_NTGUI */
 
-#ifdef HAVE_CARBON
+#if defined (MAC_OSX) && defined (HAVE_CARBON)
       syms_of_macterm ();
       syms_of_macfns ();
       syms_of_macmenu ();
       syms_of_fontset ();
-#endif /* HAVE_CARBON */
+#endif /* MAC_OSX && HAVE_CARBON */
 
 #ifdef SYMS_SYSTEM
       SYMS_SYSTEM;