Changeset 5 in libcf for trunk/src/cf_socket.c

Timestamp:

01/30/13 13:12:40 (11 years ago)

Author:

cheese

Message:

#1 add windows project and fix build compatibility

File:

• trunk/src/cf_socket.c (modified) (3 diffs)

trunk/src/cf_socket.c

@@ -7 +7 @@
 #ifdef _WIN32
 # include <WinSock2.h>
+# pragma comment (lib, "ws2_32.lib")
+# define close(__sock)  closesocket(__sock)
+# define sa_family_t    unsigned short
 #else
 # include <netinet/in.h>
@@ -74 +77 @@
     CHECK_INVALID_SOCKET (sock);
 
-    result = /* continued */
-#ifdef _WIN32
-        closesocket (socket);
-#else
-        close (sock);
-#endif
+    result = close (sock);
 
     if (result != 0)
@@ -143 +141 @@
     int result = 0;
 
-    CHECK_INVALID_SOCKET (sock);
-
-    if (timeout < 0)
-        return CF_ERROR_SOCKET_INVALID_ARGS;
-
-#ifndef _WIN32
+#ifdef _WIN32
+    int time_ms = timeout * 1000;
+#else
     struct timeval  timeval;
     timeval.tv_sec = timeout;
     timeval.tv_usec= 0;
-#else
-    int             time_ms = timeout * 1000;
-#endif
+#endif
+
+    CHECK_INVALID_SOCKET (sock);
+
+    if (timeout < 0)
+        return CF_ERROR_SOCKET_INVALID_ARGS;
 
     result = CF_Socket_SetOption (sock,