[myserver-commit] [2944] Better implementation for previous patch in r2943.

[Giuseppe Scrivano]

Revision: 2944
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2944
Author:   gscrivano
Date:     2008-11-07 20:22:14 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
Better implementation for previous patch in r2943.

Modified Paths:
--------------
    trunk/myserver/include/connections_scheduler/connections_scheduler.h
    trunk/myserver/include/filter/stream.h
    trunk/myserver/src/connections_scheduler/connections_scheduler.cpp

Modified: trunk/myserver/include/connections_scheduler/connections_scheduler.h
===================================================================
--- trunk/myserver/include/connections_scheduler/connections_scheduler.h        
2008-11-07 20:10:20 UTC (rev 2943)
+++ trunk/myserver/include/connections_scheduler/connections_scheduler.h        
2008-11-07 20:22:14 UTC (rev 2944)
@@ -69,7 +69,7 @@
     bool terminated; 
     bool terminate;
     Mutex* mutex;
-    int fd[2];
+    FileHandle fd[2];
     event loopEvent;
     Server* server;
     ConnectionsScheduler* scheduler;

Modified: trunk/myserver/include/filter/stream.h
===================================================================
--- trunk/myserver/include/filter/stream.h      2008-11-07 20:10:20 UTC (rev 
2943)
+++ trunk/myserver/include/filter/stream.h      2008-11-07 20:22:14 UTC (rev 
2944)
@@ -25,7 +25,7 @@
 typedef void* FileHandle;
 #endif
 #ifdef NOT_WIN
-typedef long  FileHandle;
+typedef int  FileHandle;
 #endif
 
 /*!

Modified: trunk/myserver/src/connections_scheduler/connections_scheduler.cpp
===================================================================
--- trunk/myserver/src/connections_scheduler/connections_scheduler.cpp  
2008-11-07 20:10:20 UTC (rev 2943)
+++ trunk/myserver/src/connections_scheduler/connections_scheduler.cpp  
2008-11-07 20:22:14 UTC (rev 2944)
@@ -39,7 +39,7 @@
 }
 
 static int
-create_socketpair(int af, int type, int protocol, int socks[2])
+create_socketpair(int af, int type, int protocol, FileHandle socks[2])
 {
 #ifndef WIN32
   return socketpair(af, type, protocol, (int*)socks);