# HG changeset patch
# User Andrew Choi <akochoi@shaw.ca>
# Date 1030295726 0
# Node ID 4e4bf31455d6a166f951d61aedc5403e016f9483
# Parent  56242900e17140b1b241b100b88e9b5f101fa549
2002-08-25  Andrew Choi  <akochoi@shaw.ca>

        * emacs.c (main): Call init_mac_osx_environment if HAVE_CARBON is
        defined instead of MAC_OSX.

        * s/darwin.h (select): Define select to sys_select only if
        HAVE_CARBON is defined.

diff -r 56242900e171 -r 4e4bf31455d6 src/ChangeLog
--- a/src/ChangeLog	Sun Aug 25 16:44:51 2002 +0000
+++ b/src/ChangeLog	Sun Aug 25 17:15:26 2002 +0000
@@ -1,7 +1,11 @@
 2002-08-25  Andrew Choi  <akochoi@shaw.ca>
 
-	* s/darwin.h (HAVE_WORKING_VFORK): #undef it.  Define vfork to
-	fork.
+	* emacs.c (main): Call init_mac_osx_environment if HAVE_CARBON is
+	defined instead of MAC_OSX.
+
+	* s/darwin.h (select): Define select to sys_select only if
+	HAVE_CARBON is defined.
+	(HAVE_WORKING_VFORK): #undef it.  Define vfork to fork.
 
 	* macterm.c (XTread_socket): Remove code to call
 	SendEventToEventTarget for keys with command modifiers when
diff -r 56242900e171 -r 4e4bf31455d6 src/emacs.c
--- a/src/emacs.c	Sun Aug 25 16:44:51 2002 +0000
+++ b/src/emacs.c	Sun Aug 25 17:15:26 2002 +0000
@@ -794,7 +794,7 @@
     run_time_remap (argv[0]);
 #endif
 
-#ifdef MAC_OSX
+#ifdef HAVE_CARBON
   if (!initialized)
     unexec_init_emacs_zone ();
 #endif
diff -r 56242900e171 -r 4e4bf31455d6 src/s/darwin.h
--- a/src/s/darwin.h	Sun Aug 25 16:44:51 2002 +0000
+++ b/src/s/darwin.h	Sun Aug 25 17:15:26 2002 +0000
@@ -312,6 +312,6 @@
 /* Reroute calls to SELECT to the version defined in mac.c to fix the
    problem of Emacs requiring an extra return to be typed to start
    working when started from the command line.  */
-#if defined (emacs) || defined (temacs)
+#if defined (HAVE_CARBON) && (defined (emacs) || defined (temacs))
 #define select sys_select
 #endif