DEVEL15-fssync-abstract-fd-type-20090316

LICENSE IPL10

apparently 64 bit windows has 64 bit fds

(cherry picked from commit 3eec4075102b18bac036c33c9acb155e44c23f08)

diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c
index 291671efb253c8af6f6eb082a2355d4ef30f0662..7129da757a24aa6880b7a4ed4829d6bb01d162eb 100644 (file)
--- a/src/vol/fssync-server.c
+++ b/src/vol/fssync-server.c
@@ -124,7 +124,7 @@ static SYNC_server_state_t fssync_server_state =
 
 /* Forward declarations */
 static void * FSYNC_sync(void *);
-static void FSYNC_newconnection(int afd);
+static void FSYNC_newconnection(osi_socket afd);
 static void FSYNC_com(int fd);
 static void FSYNC_Drop(int fd);
 static void AcceptOn(void);
@@ -298,14 +298,14 @@ FSYNC_sync(void * args)
 }
 
 static void
-FSYNC_newconnection(int afd)
+FSYNC_newconnection(osi_socket afd)
 {
 #ifdef USE_UNIX_SOCKETS
     struct sockaddr_un other;
 #else  /* USE_UNIX_SOCKETS */
     struct sockaddr_in other;
 #endif
-    int fd;
+    osi_socket fd;
     socklen_t junk;
     junk = sizeof(other);
     fd = accept(afd, (struct sockaddr *)&other, &junk);