Mercurial > emacs
changeset 80769:99dee4fe249c
(mac_system_script_code): Use EMACS_INT for DEFVAR_INT variable.
[MAC_OSX] (mac_try_close_socket, sys_select) [SELECT_USE_CFSOCKET]:
Cast to pointer-size integer before casting to pointer.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Fri, 29 Aug 2008 08:18:07 +0000 |
| parents | 5b546e629ab2 |
| children | a044f4615c60 |
| files | src/mac.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mac.c Fri Aug 29 05:14:17 2008 +0000 +++ b/src/mac.c Fri Aug 29 08:18:07 2008 +0000 @@ -69,7 +69,7 @@ #endif /* The system script code. */ -static int mac_system_script_code; +static EMACS_INT mac_system_script_code; /* The system locale identifier string. */ static Lisp_Object Vmac_system_locale; @@ -5047,7 +5047,7 @@ #if SELECT_USE_CFSOCKET if (getpid () == mac_emacs_pid && cfsockets_for_select) { - void *key = (void *) fd; + void *key = (void *) (long) fd; CFSocketRef socket = (CFSocketRef) CFDictionaryGetValue (cfsockets_for_select, key); @@ -5160,7 +5160,7 @@ for (fd = minfd; fd < nfds; fd++) if (FD_ISSET (fd, rfds) || (wfds && FD_ISSET (fd, wfds))) { - void *key = (void *) fd; + void *key = (void *) (long) fd; CFRunLoopSourceRef source = (CFRunLoopSourceRef) CFDictionaryGetValue (sources, key); @@ -5190,7 +5190,7 @@ for (fd = minfd; fd < nfds; fd++) if (FD_ISSET (fd, rfds) || (wfds && FD_ISSET (fd, wfds))) { - void *key = (void *) fd; + void *key = (void *) (long) fd; CFRunLoopSourceRef source = (CFRunLoopSourceRef) CFDictionaryGetValue (sources, key);