diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2013-03-04 04:34:38 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2013-03-04 04:34:38 +0000 |
| commit | 9df2311a5f5f9211f24ad03e13c161ec5d6429bf (patch) | |
| tree | 023ff56f7de98ae93d9ad94a76ac06de34b7ccdf /pjlib | |
| parent | a3bbd2d78cfde6c165335dd073ccbad952d6bdd7 (diff) | |
Misc (re #1559): fixed compile errors/warnings on Symbian platform.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4411 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/src/pj/lock.c | 22 | ||||
| -rw-r--r-- | pjlib/src/pj/os_info.c | 3 |
2 files changed, 14 insertions, 11 deletions
diff --git a/pjlib/src/pj/lock.c b/pjlib/src/pj/lock.c index 04b1b670..a9e60594 100644 --- a/pjlib/src/pj/lock.c +++ b/pjlib/src/pj/lock.c @@ -351,7 +351,7 @@ static pj_status_t grp_lock_destroy(LOCK_OBJ *p) lck = glock->lock_list.next; while (lck != &glock->lock_list) { if (lck->lock != glock->own_lock) { - unsigned i; + int i; for (i=0; i<glock->owner_cnt; ++i) pj_lock_release(lck->lock); } @@ -447,27 +447,27 @@ PJ_DEF(pj_status_t) pj_grp_lock_release( pj_grp_lock_t *grp_lock) return grp_lock_release(grp_lock); } -PJ_DEF(pj_status_t) pj_grp_lock_replace( pj_grp_lock_t *old, - pj_grp_lock_t *new) +PJ_DEF(pj_status_t) pj_grp_lock_replace( pj_grp_lock_t *old_lock, + pj_grp_lock_t *new_lock) { grp_destroy_callback *ocb; /* Move handlers from old to new */ - ocb = old->destroy_list.next; - while (ocb != &old->destroy_list) { + ocb = old_lock->destroy_list.next; + while (ocb != &old_lock->destroy_list) { grp_destroy_callback *ncb; - ncb = PJ_POOL_ALLOC_T(new->pool, grp_destroy_callback); + ncb = PJ_POOL_ALLOC_T(new_lock->pool, grp_destroy_callback); ncb->comp = ocb->comp; ncb->handler = ocb->handler; - pj_list_push_back(&new->destroy_list, ncb); + pj_list_push_back(&new_lock->destroy_list, ncb); ocb = ocb->next; } - pj_list_init(&old->destroy_list); + pj_list_init(&old_lock->destroy_list); - grp_lock_destroy(old); + grp_lock_destroy(old_lock); return PJ_SUCCESS; } @@ -614,7 +614,7 @@ PJ_DEF(pj_status_t) pj_grp_lock_chain_lock( pj_grp_lock_t *glock, int pos) { grp_lock_item *lck, *new_lck; - unsigned i; + int i; grp_lock_acquire(glock); @@ -653,7 +653,7 @@ PJ_DEF(pj_status_t) pj_grp_lock_unchain_lock( pj_grp_lock_t *glock, } if (lck != &glock->lock_list) { - unsigned i; + int i; pj_list_erase(lck); for (i=0; i<glock->owner_cnt; ++i) diff --git a/pjlib/src/pj/os_info.c b/pjlib/src/pj/os_info.c index fe284add..f7136c11 100644 --- a/pjlib/src/pj/os_info.c +++ b/pjlib/src/pj/os_info.c @@ -242,6 +242,9 @@ PJ_DEF(const pj_sys_info*) pj_get_sys_info(void) } else { si.os_name = pj_str("Unknown"); } + + /* Avoid compile warning on Symbian. */ + goto get_sdk_info; } #endif |