Changeset 4426

Timestamp:

Mar 7, 2013 5:08:10 AM (11 years ago)

Author:

riza

Message:

Misc (re #1634): fixed compile errors/warnings on MSVC

Location:

pjproject/branches/1.x

Files:

• pjlib-util/src/pjlib-util/stun_simple_client.c (modified) (2 diffs)
• pjlib/src/pj/ioqueue_common_abs.c (modified) (3 diffs)
• pjsip-apps/src/pjsystest/systest.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/branches/1.x/pjlib-util/src/pjlib-util/stun_simple_client.c

@@ -46 +46 @@
     unsigned srv_cnt;
     pj_sockaddr_in srv_addr[2];
-    int i, j, send_cnt = 0, nfds;
+    int i, send_cnt = 0, nfds;
     pj_pool_t *pool;
     struct query_rec {
@@ -136 +136 @@
         /* Send messages to servers that has not given us response. */
         for (i=0; i<sock_cnt && status==PJ_SUCCESS; ++i) {
+            unsigned j;
             for (j=0; j<srv_cnt && status==PJ_SUCCESS; ++j) {
                 pjstun_msg_hdr *msg_hdr = (pjstun_msg_hdr*) out_msg;

pjproject/branches/1.x/pjlib/src/pj/ioqueue_common_abs.c

@@ -284 +284 @@
         struct write_operation *write_op;
         pj_ssize_t sent;
-        pj_status_t send_rc;
+        pj_status_t send_rc = PJ_SUCCESS;
 
         /* Get the first in the queue. */
@@ -313 +313 @@
             //write_op->op = 0;
         } else if (write_op->op == PJ_IOQUEUE_OP_SEND_TO) {
-            int retry;
-            for (retry=0; retry<2; ++retry) {
+            int retry = 2;
+            while (--retry >= 0) {
                 send_rc = pj_sock_sendto(h->fd, 
                                          write_op->buf+write_op->written,
@@ -946 +946 @@
     PJ_CHECK_STACK();
 
+#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
+            PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
 retry_on_restart:
+#endif
+
     /* Check if key is closing. */
     if (IS_CLOSING(key))

pjproject/branches/1.x/pjsip-apps/src/pjsystest/systest.c

@@ -89 +89 @@
 /*****************************************************************/
 
+#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
 PJ_INLINE(char *) add_path(const char *path, const char *fname)
 {
@@ -95 +96 @@
     return fpath;
 }
+#else
+#   define add_path(path, fname) fname
+#endif
 
 static void exit_app(void)

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1734 +1734 @@
     pjmedia_port *media_port;
     pj_status_t status;
+
+    PJ_UNUSED_ARG(local_sdp);
+    PJ_UNUSED_ARG(remote_sdp);
     
     /* Optionally, application may modify other stream settings here