Changeset 3148


Ignore:
Timestamp:
Apr 28, 2010 7:52:57 AM (12 years ago)
Author:
nanang
Message:

Misc (#1026) fixed build problems on Symbian S60 5th edition:

  • link error undefined reference to `.L23' in function pjsip_cred_info_cmp() (thanks Ken Fish for the report).
  • compile error unable to convert pj_uint32_t to pjsip_transport_state.
Location:
pjproject/trunk/pjsip/src/pjsip
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

    r3144 r3148  
    8888 
    8989    result = pj_strcmp(&cred1->realm, &cred2->realm); 
    90     if (result) return result; 
     90    if (result) goto on_return; 
    9191    result = pj_strcmp(&cred1->scheme, &cred2->scheme); 
    92     if (result) return result; 
     92    if (result) goto on_return; 
    9393    result = pj_strcmp(&cred1->username, &cred2->username); 
    94     if (result) return result; 
     94    if (result) goto on_return; 
    9595    result = pj_strcmp(&cred1->data, &cred2->data); 
    96     if (result) return result; 
    97     if (cred1->data_type != cred2->data_type) 
    98         return -1; 
     96    if (result) goto on_return; 
     97    result = (cred1->data_type != cred2->data_type); 
     98    if (result) goto on_return; 
    9999 
    100100    if ((cred1->data_type & EXT_MASK) == PJSIP_CRED_DATA_EXT_AKA) { 
    101101        result = pj_strcmp(&cred1->ext.aka.k, &cred2->ext.aka.k); 
    102         if (result) return result; 
     102        if (result) goto on_return; 
    103103        result = pj_strcmp(&cred1->ext.aka.op, &cred2->ext.aka.op); 
    104         if (result) return result; 
     104        if (result) goto on_return; 
    105105        result = pj_strcmp(&cred1->ext.aka.amf, &cred2->ext.aka.amf); 
    106         if (result) return result; 
    107     } 
    108  
     106        if (result) goto on_return; 
     107    } 
     108 
     109on_return: 
    109110    return result; 
    110111} 
  • pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

    r3138 r3148  
    14711471        pjsip_transport_state_info state_info; 
    14721472        pjsip_tls_state_info tls_info; 
    1473         pj_uint32_t tp_state = 0; 
     1473        pjsip_transport_state tp_state; 
    14741474 
    14751475        /* Init transport state info */ 
Note: See TracChangeset for help on using the changeset viewer.