Changeset 3255


Ignore:
Timestamp:
Aug 6, 2010 7:18:08 AM (9 years ago)
Author:
nanang
Message:

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

Location:
pjproject/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/build.symbian/libgsmcodec.mmp

    r3046 r3255  
    6565SYSTEMINCLUDE   ..\pjmedia\include 
    6666SYSTEMINCLUDE   ..\pjlib\include  
     67SYSTEMINCLUDE   ..\third_party\build\gsm 
    6768SYSTEMINCLUDE   ..\third_party\gsm\inc 
    6869 
  • pjproject/trunk/pjlib/src/pj/errno.c

    r2992 r3255  
    218218    /* Build the title */ 
    219219    len = pj_ansi_vsnprintf(titlebuf, sizeof(titlebuf), title_fmt, marker); 
    220     if (len < 0 || len >= sizeof(titlebuf)) 
     220    if (len < 0 || len >= (int)sizeof(titlebuf)) 
    221221        pj_ansi_strcpy(titlebuf, "Error"); 
    222222 
  • pjproject/trunk/pjlib/src/pj/log.c

    r2868 r3255  
    3131static int pj_log_max_level = PJ_LOG_MAX_LEVEL; 
    3232#endif 
     33 
     34#if PJ_HAS_THREADS 
    3335static long thread_suspended_tls_id = -1; 
     36#endif 
     37 
    3438static pj_log_func *log_writer = &pj_log_write; 
    3539static unsigned log_decor = PJ_LOG_HAS_TIME | PJ_LOG_HAS_MICRO_SEC | 
     
    6872#endif 
    6973 
     74#if PJ_HAS_THREADS 
    7075static void logging_shutdown(void) 
    7176{ 
    72 #if PJ_HAS_THREADS 
    7377    if (thread_suspended_tls_id != -1) { 
    7478        pj_thread_local_free(thread_suspended_tls_id); 
    7579        thread_suspended_tls_id = -1; 
    7680    } 
    77 #endif 
    78 } 
     81} 
     82#endif 
    7983 
    8084pj_status_t pj_log_init(void) 
  • pjproject/trunk/pjmedia/src/pjmedia/wsola.c

    r2850 r3255  
    851851            if (reg2_len == 0) { 
    852852                wsola_fade_out(wsola, reg1 + reg1_len - count, count); 
    853             } else if ((int)reg2_len >= count) { 
     853            } else if (reg2_len >= count) { 
    854854                wsola_fade_out(wsola, reg2 + reg2_len - count, count); 
    855855            } else { 
  • pjproject/trunk/pjsip/src/pjsip-simple/presence_body.c

    r3045 r3255  
    127127                                   pt.year, pt.mon+1, pt.day,  
    128128                                   pt.hour, pt.min, pt.sec, pt.msec); 
    129           if (tslen > 0 && tslen < sizeof(buf)) { 
     129          if (tslen > 0 && tslen < (int)sizeof(buf)) { 
    130130              pj_str_t time = pj_str(buf); 
    131131              pjpidf_tuple_set_timestamp(pool, pidf_tuple, &time); 
  • pjproject/trunk/pjsip/src/pjsip/sip_multipart.c

    r3244 r3255  
    192192        src_hdr = src_part->hdr.next; 
    193193        while (src_hdr != &src_part->hdr) { 
    194             pjsip_hdr *dst_hdr = pjsip_hdr_clone(pool, src_hdr); 
     194            pjsip_hdr *dst_hdr = (pjsip_hdr*)pjsip_hdr_clone(pool, src_hdr); 
    195195            pj_list_push_back(&dst_part->hdr, dst_hdr); 
    196196            src_hdr = src_hdr->next; 
     
    486486        part->body->len = end - start_body; 
    487487    } else { 
    488         part->body->data = ""; 
     488        part->body->data = (void*)""; 
    489489        part->body->len = 0; 
    490490    } 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

    r3243 r3255  
    13081308        /* First stage, get the maximum wait time */ 
    13091309        max_wait = 100; 
    1310         for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i) { 
     1310        for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.acc); ++i) { 
    13111311            if (!pjsua_var.acc[i].valid) 
    13121312                continue; 
     
    13321332 
    13331333        /* Third stage, forcefully destroy unfinished unpublications */ 
    1334         for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i) { 
     1334        for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.acc); ++i) { 
    13351335            if (pjsua_var.acc[i].publish_sess) { 
    13361336                pjsip_publishc_destroy(pjsua_var.acc[i].publish_sess); 
     
    13621362        /* First stage, get the maximum wait time */ 
    13631363        max_wait = 100; 
    1364         for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i) { 
     1364        for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.acc); ++i) { 
    13651365            if (!pjsua_var.acc[i].valid) 
    13661366                continue; 
Note: See TracChangeset for help on using the changeset viewer.