(SELECT_USE_CFSOCKET) [MAC_OSX]: Set default to 1.

[MAC_OSX] (sys_select) [SELECT_USE_CFSOCKET]: Fix pointer type.

diff --git a/src/ChangeLog b/src/ChangeLog
index 30f1ad715431437c286f1263f9ba95dacd518fba..da01ca857a6b619e4e110b51ab48cafec0f65296 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * mac.c (SELECT_USE_CFSOCKET) [MAC_OSX]: Set default to 1.
+       [MAC_OSX] (sys_select) [SELECT_USE_CFSOCKET]: Fix pointer type.
+
 2006-09-17  Jay Belanger  <belanger@truman.edu>
 
        * gmalloc.c:

diff --git a/src/mac.c b/src/mac.c
index 51b821dcd953277476b39e50c8571a3deaca477a..151cce9c0f3e80a1266551eaaad14ff38411efdd 100644 (file)
--- a/src/mac.c
+++ b/src/mac.c
@@ -4975,6 +4975,10 @@ extern int noninteractive;
          executing `select' with a short timeout
          (SELECT_POLLING_PERIOD_USEC microseconds).  */
 
+#ifndef SELECT_USE_CFSOCKET
+#define SELECT_USE_CFSOCKET 1
+#endif
+
 #define SELECT_POLLING_PERIOD_USEC 100000
 #if SELECT_USE_CFSOCKET
 #define SELECT_TIMEOUT_THRESHOLD_RUNLOOP 0.2
@@ -5115,7 +5119,7 @@ sys_select (nfds, rfds, wfds, efds, timeout)
          int minfd, fd;
          CFRunLoopRef runloop =
            (CFRunLoopRef) GetCFRunLoopFromEventLoop (GetCurrentEventLoop ());
-         static CFSocketContext context = {0, &ofds, NULL, NULL, NULL};
+         static CFSocketContext context = {0, ofds, NULL, NULL, NULL};
          static CFMutableDictionaryRef sources;
 
          if (sources == NULL)