Ignore:
Timestamp:
Mar 4, 2013 4:34:38 AM (8 years ago)
Author:
nanang
Message:

Misc (re #1559): fixed compile errors/warnings on Symbian platform.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/src/pj/lock.c

    r4359 r4411  
    352352    while (lck != &glock->lock_list) { 
    353353        if (lck->lock != glock->own_lock) { 
    354             unsigned i; 
     354            int i; 
    355355            for (i=0; i<glock->owner_cnt; ++i) 
    356356                pj_lock_release(lck->lock); 
     
    448448} 
    449449 
    450 PJ_DEF(pj_status_t) pj_grp_lock_replace( pj_grp_lock_t *old, 
    451                                          pj_grp_lock_t *new) 
     450PJ_DEF(pj_status_t) pj_grp_lock_replace( pj_grp_lock_t *old_lock, 
     451                                         pj_grp_lock_t *new_lock) 
    452452{ 
    453453    grp_destroy_callback *ocb; 
    454454 
    455455    /* Move handlers from old to new */ 
    456     ocb = old->destroy_list.next; 
    457     while (ocb != &old->destroy_list) { 
     456    ocb = old_lock->destroy_list.next; 
     457    while (ocb != &old_lock->destroy_list) { 
    458458        grp_destroy_callback *ncb; 
    459459 
    460         ncb = PJ_POOL_ALLOC_T(new->pool, grp_destroy_callback); 
     460        ncb = PJ_POOL_ALLOC_T(new_lock->pool, grp_destroy_callback); 
    461461        ncb->comp = ocb->comp; 
    462462        ncb->handler = ocb->handler; 
    463         pj_list_push_back(&new->destroy_list, ncb); 
     463        pj_list_push_back(&new_lock->destroy_list, ncb); 
    464464 
    465465        ocb = ocb->next; 
    466466    } 
    467467 
    468     pj_list_init(&old->destroy_list); 
    469  
    470     grp_lock_destroy(old); 
     468    pj_list_init(&old_lock->destroy_list); 
     469 
     470    grp_lock_destroy(old_lock); 
    471471    return PJ_SUCCESS; 
    472472} 
     
    615615{ 
    616616    grp_lock_item *lck, *new_lck; 
    617     unsigned i; 
     617    int i; 
    618618 
    619619    grp_lock_acquire(glock); 
     
    654654 
    655655    if (lck != &glock->lock_list) { 
    656         unsigned i; 
     656        int i; 
    657657 
    658658        pj_list_erase(lck); 
Note: See TracChangeset for help on using the changeset viewer.