Changeset 4537 for pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c

Timestamp:

Jun 19, 2013 6:47:43 AM (11 years ago)

Author:

riza

Message:

Re #1680: Add initial support for Win64

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c

@@ -241 +241 @@
           }
         }
-#elif defined(PJ_WIN32) && PJ_WIN32!=0
+#elif (defined(PJ_WIN32) && PJ_WIN32!=0) || (defined(PJ_WIN64) && PJ_WIN64!=0) 
         status = PJ_SUCCESS; /* success */
 #else
@@ -524 +524 @@
              */
 #           if defined(PJ_WIN32) && PJ_WIN32 != 0 || \
+               defined(PJ_WIN64) && PJ_WIN64 != 0 || \
                defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE != 0
                 rc = pj_sock_recv(h->fd, read_op->buf, &bytes_read, 
@@ -541 +542 @@
         
         if (rc != PJ_SUCCESS) {
-#           if defined(PJ_WIN32) && PJ_WIN32 != 0
+#           if (defined(PJ_WIN32) && PJ_WIN32 != 0) || \
+               (defined(PJ_WIN64) && PJ_WIN64 != 0) 
             /* On Win32, for UDP, WSAECONNRESET on the receive side 
              * indicates that previous sending has triggered ICMP Port 
@@ -1282 +1284 @@
             (*key->cb.on_accept_complete)(key, op_key, 
                                           PJ_INVALID_SOCKET,
-                                          bytes_status);
+                                          (pj_status_t)bytes_status);
             return PJ_SUCCESS;
         }