Changeset 3255

Timestamp:

Aug 6, 2010 7:18:08 AM (14 years ago)

Author:

nanang

Message:

Misc (re #1068): fix compile errors/warnings on Symbian S60 5th ed.

Location:

pjproject/trunk

Files:

• build.symbian/libgsmcodec.mmp (modified) (1 diff)
• pjlib/src/pj/errno.c (modified) (1 diff)
• pjlib/src/pj/log.c (modified) (2 diffs)
• pjmedia/src/pjmedia/wsola.c (modified) (1 diff)
• pjsip/src/pjsip-simple/presence_body.c (modified) (1 diff)
• pjsip/src/pjsip/sip_multipart.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)

pjproject/trunk/build.symbian/libgsmcodec.mmp

@@ -65 +65 @@
 SYSTEMINCLUDE   ..\pjmedia\include
 SYSTEMINCLUDE   ..\pjlib\include 
+SYSTEMINCLUDE   ..\third_party\build\gsm
 SYSTEMINCLUDE   ..\third_party\gsm\inc
 

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

@@ -218 +218 @@
     /* Build the title */
     len = pj_ansi_vsnprintf(titlebuf, sizeof(titlebuf), title_fmt, marker);
-    if (len < 0 || len >= sizeof(titlebuf))
+    if (len < 0 || len >= (int)sizeof(titlebuf))
         pj_ansi_strcpy(titlebuf, "Error");
 

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

@@ -31 +31 @@
 static int pj_log_max_level = PJ_LOG_MAX_LEVEL;
 #endif
+
+#if PJ_HAS_THREADS
 static long thread_suspended_tls_id = -1;
+#endif
+
 static pj_log_func *log_writer = &pj_log_write;
 static unsigned log_decor = PJ_LOG_HAS_TIME | PJ_LOG_HAS_MICRO_SEC |
@@ -68 +72 @@
 #endif
 
+#if PJ_HAS_THREADS
 static void logging_shutdown(void)
 {
-#if PJ_HAS_THREADS
     if (thread_suspended_tls_id != -1) {
         pj_thread_local_free(thread_suspended_tls_id);
         thread_suspended_tls_id = -1;
     }
-#endif
-}
+}
+#endif
 
 pj_status_t pj_log_init(void)

pjproject/trunk/pjmedia/src/pjmedia/wsola.c

@@ -851 +851 @@
             if (reg2_len == 0) {
                 wsola_fade_out(wsola, reg1 + reg1_len - count, count);
-            } else if ((int)reg2_len >= count) {
+            } else if (reg2_len >= count) {
                 wsola_fade_out(wsola, reg2 + reg2_len - count, count);
             } else {

pjproject/trunk/pjsip/src/pjsip-simple/presence_body.c

@@ -127 +127 @@
                                    pt.year, pt.mon+1, pt.day, 
                                    pt.hour, pt.min, pt.sec, pt.msec);
-          if (tslen > 0 && tslen < sizeof(buf)) {
+          if (tslen > 0 && tslen < (int)sizeof(buf)) {
               pj_str_t time = pj_str(buf);
               pjpidf_tuple_set_timestamp(pool, pidf_tuple, &time);

pjproject/trunk/pjsip/src/pjsip/sip_multipart.c

@@ -192 +192 @@
         src_hdr = src_part->hdr.next;
         while (src_hdr != &src_part->hdr) {
-            pjsip_hdr *dst_hdr = pjsip_hdr_clone(pool, src_hdr);
+            pjsip_hdr *dst_hdr = (pjsip_hdr*)pjsip_hdr_clone(pool, src_hdr);
             pj_list_push_back(&dst_part->hdr, dst_hdr);
             src_hdr = src_hdr->next;
@@ -486 +486 @@
         part->body->len = end - start_body;
     } else {
-        part->body->data = "";
+        part->body->data = (void*)"";
         part->body->len = 0;
     }

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -1308 +1308 @@
         /* First stage, get the maximum wait time */
         max_wait = 100;
-        for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
+        for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
             if (!pjsua_var.acc[i].valid)
                 continue;
@@ -1332 +1332 @@
 
         /* Third stage, forcefully destroy unfinished unpublications */
-        for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
+        for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
             if (pjsua_var.acc[i].publish_sess) {
                 pjsip_publishc_destroy(pjsua_var.acc[i].publish_sess);
@@ -1362 +1362 @@
         /* First stage, get the maximum wait time */
         max_wait = 100;
-        for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
+        for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
             if (!pjsua_var.acc[i].valid)
                 continue;