Commit a6311b2f authored by Andrew Choi's avatar Andrew Choi

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.
parent 511ca371
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
......
......@@ -794,7 +794,7 @@ main (argc, argv, envp)
run_time_remap (argv[0]);
#endif
#ifdef MAC_OSX
#ifdef HAVE_CARBON
if (!initialized)
unexec_init_emacs_zone ();
#endif
......
......@@ -312,6 +312,6 @@ struct kboard;
/* 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment