Changeset 6 in libcf++

Timestamp:

03/21/15 20:10:50 (9 years ago)

Author:

cheese

Message:

#1 fix socket patch for windows

File:

• trunk/src/network.cpp (modified) (6 diffs)

trunk/src/network.cpp

@@ -31 +31 @@
 # define ERROR_INTR             WSAEINTR
 # define ERROR_CONNECTING       WSAEWOULDBLOCK
+# define SOCKET_API_CALL        __stdcall
 #else
 # define closesocket(__sock)    ::close(__sock)
 # define ERROR_INTR             EINTR
 # define ERROR_CONNECTING       EINPROGRESS
+# define SOCKET_API_CALL
 #endif
 
-#define INVALID_SOCKET  -1
+#define UNUSED_SOCKET   -1
 
 /*--------------------------------------------------------------*/
@@ -130 +132 @@
 }
 
-typedef cf::int32_t (*getSocketNameAPI)(cf::socket_t sock,
-                                        struct sockaddr * addr,
-                                        socklen_t *len);
+typedef cf::int32_t (SOCKET_API_CALL * getSocketNameAPI)(cf::socket_t sock,
+                                                         struct sockaddr * addr,
+                                                         socklen_t *len);
 
 static cf::network::host getSocketNameFromFunction(const cf::socket_t sock,
@@ -194 +196 @@
     }
 
-    if (mSocket == INVALID_SOCKET)
+    if (mSocket == UNUSED_SOCKET)
         mSocket = ::socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 
@@ -208 +210 @@
 cf::void_t cf::network::tcp::close()
 {
-    if (mSocket == INVALID_SOCKET)
+    if (mSocket == UNUSED_SOCKET)
         return;
 
     closesocket(mSocket);
 
-    mSocket = INVALID_SOCKET;
+    mSocket = UNUSED_SOCKET;
 }
 
@@ -343 +345 @@
     throw (exception)
 {
-    if (sock == INVALID_SOCKET)
+    if (sock == UNUSED_SOCKET)
         THROW_EXCEPTION("has invalid socket");
 
@@ -354 +356 @@
     throw (exception)
 {
-    if (mSocket == INVALID_SOCKET)
+    if (mSocket == UNUSED_SOCKET)
         THROW_EXCEPTION("has invalid socket");
 
     cf::socket_t sock = mSocket;
 
-    mSocket = INVALID_SOCKET;
+    mSocket = UNUSED_SOCKET;
 
     return sock;