diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2010-08-06 07:18:08 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2010-08-06 07:18:08 +0000 |
| commit | 18fac5458c89f62ce713f669560536cfaba3efe2 (patch) | |
| tree | f3653d3b78c78cafcae3bf16e10f466224193c1a /pjsip | |
| parent | 6938680706bd20311a32ce476570c0cf44ee1ba3 (diff) | |
Misc (re #1068): fix compile errors/warnings on Symbian S60 5th ed.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3255 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsip-simple/presence_body.c | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsip/sip_multipart.c | 4 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pjsip/src/pjsip-simple/presence_body.c b/pjsip/src/pjsip-simple/presence_body.c index 20e74458..a57e8df9 100644 --- a/pjsip/src/pjsip-simple/presence_body.c +++ b/pjsip/src/pjsip-simple/presence_body.c @@ -126,7 +126,7 @@ PJ_DEF(pj_status_t) pjsip_pres_create_pidf( pj_pool_t *pool, "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ", 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); } diff --git a/pjsip/src/pjsip/sip_multipart.c b/pjsip/src/pjsip/sip_multipart.c index b5d1f540..e9aa76e2 100644 --- a/pjsip/src/pjsip/sip_multipart.c +++ b/pjsip/src/pjsip/sip_multipart.c @@ -191,7 +191,7 @@ static void* multipart_clone_data(pj_pool_t *pool, const void *data, 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; } @@ -485,7 +485,7 @@ static pjsip_multipart_part *parse_multipart_part(pj_pool_t *pool, part->body->data = start_body; part->body->len = end - start_body; } else { - part->body->data = ""; + part->body->data = (void*)""; part->body->len = 0; } TRACE_((THIS_FILE, "Body parsed: \"%.*s\"", (int)part->body->len, diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 3150d977..368996d1 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -1307,7 +1307,7 @@ PJ_DEF(pj_status_t) pjsua_destroy(void) */ /* 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; if (pjsua_var.acc[i].cfg.unpublish_max_wait_time_msec > max_wait) @@ -1331,7 +1331,7 @@ PJ_DEF(pj_status_t) pjsua_destroy(void) } /* 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); pjsua_var.acc[i].publish_sess = NULL; @@ -1361,7 +1361,7 @@ PJ_DEF(pj_status_t) pjsua_destroy(void) /* Wait until all unregistrations are done (ticket #364) */ /* 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; if (pjsua_var.acc[i].cfg.unreg_timeout > max_wait) |