Changeset 4099


Ignore:
Timestamp:
Apr 26, 2012 4:46:27 PM (7 years ago)
Author:
nanang
Message:

Misc (re #1446): Fixed compile errors on Symbian S60 5th Ed SDK: unrecognized a struct defined inside another struct and 64 bit integer constants suffix.

Location:
pjproject/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia/clock_thread.c

    r3854 r4099  
    8484 
    8585#if PJ_HAS_INT64 
    86     if (ts.u64 > 0x3FFFFFFFFFFFFFUL) 
     86    if (ts.u64 > 0x3FFFFFFFFFFFFFULL) 
    8787        return (pj_uint32_t)(ts.u64 / clocksrc->clock_rate * 1000); 
    8888    else 
  • pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

    r4059 r4099  
    469469        max_len = stream->out_rtcp_pkt_size; 
    470470    } else { 
    471         pkt = sr_rr_pkt; 
     471        pkt = (pj_uint8_t*)sr_rr_pkt; 
    472472        max_len = len; 
    473473    } 
  • pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

    r4071 r4099  
    362362} pjsua_vid_win; 
    363363 
     364 
     365typedef struct pjsua_timer_list 
     366{ 
     367    PJ_DECL_LIST_MEMBER(struct pjsua_timer_list); 
     368    pj_timer_entry         entry; 
     369    void                  (*cb)(void *user_data); 
     370    void                   *user_data; 
     371} pjsua_timer_list; 
     372 
     373 
    364374/** 
    365375 * Global pjsua application data. 
     
    464474 
    465475    /* Timer entry list */ 
    466     struct timer_list 
    467     { 
    468         PJ_DECL_LIST_MEMBER(struct timer_list); 
    469         pj_timer_entry          entry; 
    470         void                  (*cb)(void *user_data); 
    471         void                   *user_data; 
    472     } timer_list; 
     476    pjsua_timer_list     timer_list; 
    473477    pj_mutex_t          *timer_mutex; 
    474478}; 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

    r4086 r4099  
    26302630                      pj_timer_entry *entry) 
    26312631{ 
    2632     struct timer_list *tmr = (struct timer_list *)entry->user_data; 
     2632    pjsua_timer_list *tmr = (pjsua_timer_list *)entry->user_data; 
    26332633    void (*cb)(void *user_data) = tmr->cb; 
    26342634    void *user_data = tmr->user_data; 
     
    26512651                                           unsigned msec_delay) 
    26522652{ 
    2653     struct timer_list *tmr = NULL; 
     2653    pjsua_timer_list *tmr = NULL; 
    26542654    pj_status_t status; 
    26552655    pj_time_val delay; 
     
    26582658 
    26592659    if (pj_list_empty(&pjsua_var.timer_list)) { 
    2660         tmr = PJ_POOL_ALLOC_T(pjsua_var.pool, struct timer_list); 
     2660        tmr = PJ_POOL_ALLOC_T(pjsua_var.pool, pjsua_timer_list); 
    26612661    } else { 
    26622662        tmr = pjsua_var.timer_list.next; 
Note: See TracChangeset for help on using the changeset viewer.