(emacs_close) [MAC_OSX && HAVE_CARBON]:

Use mac_try_close_socket.
This commit is contained in:
YAMAMOTO Mitsuharu 2007-11-30 08:20:08 +00:00
parent 6bfb1e350d
commit 959116ef2c
2 changed files with 20 additions and 0 deletions

View file

@ -1,3 +1,14 @@
2007-11-30 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* mac.c (cfsockets_for_select) [MAC_OSX && SELECT_USE_CFSOCKET]:
New variable.
(mac_try_close_socket) [MAC_OSX]: New function.
[MAC_OSX] (sys_select) [SELECT_USE_CFSOCKET]:
Update cfsockets_for_select. Replace invalid CFRunLoop source.
* sysdep.c (emacs_close) [MAC_OSX && HAVE_CARBON]:
Use mac_try_close_socket.
2007-11-28 Petr Salinger <Petr.Salinger@seznam.cz> (tiny change)
* s/gnu-kfreebsd.h: New file.

View file

@ -3320,6 +3320,15 @@ emacs_close (fd)
int did_retry = 0;
register int rtnval;
#if defined (MAC_OSX) && defined (HAVE_CARBON)
{
extern int mac_try_close_socket P_ ((int));
if (mac_try_close_socket (fd))
return 0;
}
#endif
while ((rtnval = close (fd)) == -1
&& (errno == EINTR))
did_retry = 1;