[Emacs-diffs] Changes to emacs/src/Attic/mac.c,v [EMACS_22_BASE]

[YAMAMOTO Mitsuharu]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     YAMAMOTO Mitsuharu <mituharu>   08/08/29 08:18:08

Index: mac.c
===================================================================
RCS file: /sources/emacs/emacs/src/Attic/mac.c,v
retrieving revision 1.77.2.9
retrieving revision 1.77.2.10
diff -u -b -r1.77.2.9 -r1.77.2.10
--- mac.c       19 Apr 2008 01:24:47 -0000      1.77.2.9
+++ mac.c       29 Aug 2008 08:18:07 -0000      1.77.2.10
@@ -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);