Commit 5ee4de53 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

(mac_emacs_pid) [MAC_OSX]: New variable.

[MAC_OSX] (init_mac_osx_environment): Initialize it.
[MAC_OSX] (mac_try_close_socket) [SELECT_USE_CFSOCKET]:	Return 0
when used on child processes.
parent d31dcb11
2008-01-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* mac.c (mac_emacs_pid) [MAC_OSX]: New variable.
[MAC_OSX] (init_mac_osx_environment): Initialize it.
[MAC_OSX] (mac_try_close_socket) [SELECT_USE_CFSOCKET]: Return 0
when used on child processes.
2008-01-10 Chong Yidong <cyd@stupidchicken.com>
 
* process.c (wait_reading_process_output): Check for window
......
......@@ -5013,6 +5013,9 @@ extern int noninteractive;
sys_select. */
static CFMutableDictionaryRef cfsockets_for_select;
/* Process ID of Emacs. */
static pid_t mac_emacs_pid;
static void
socket_callback (s, type, address, data, info)
CFSocketRef s;
......@@ -5092,7 +5095,7 @@ mac_try_close_socket (fd)
int fd;
{
#if SELECT_USE_CFSOCKET
if (cfsockets_for_select)
if (getpid () == mac_emacs_pid && cfsockets_for_select)
{
void *key = (void *) fd;
CFSocketRef socket =
......@@ -5329,6 +5332,8 @@ init_mac_osx_environment ()
char *p, *q;
struct stat st;
mac_emacs_pid = getpid ();
/* Initialize locale related variables. */
mac_system_script_code =
(ScriptCode) GetScriptManagerVariable (smSysScript);
......
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