Changeset 4087


Ignore:
Timestamp:
Apr 26, 2012 3:39:24 AM (7 years ago)
Author:
ming
Message:

Re #1446 (misc): Disable SDL by default on iOS and fixed various compiler warnings.

Location:
pjproject/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/configure-iphone

    r3999 r4087  
    134134 
    135135# And finally invoke the configure script itself 
    136 ./aconfigure --host=arm-apple-darwin9 --disable-floating-point $* 
     136./aconfigure --host=arm-apple-darwin9 --disable-floating-point --disable-sdl $* 
    137137 
    138138if test "$?" = "0"; then 
  • pjproject/trunk/pjmedia/src/pjmedia/converter.c

    r3664 r4087  
    4040{ 
    4141    pjmedia_converter_mgr *mgr; 
    42     pj_status_t status; 
     42    pj_status_t status = PJ_SUCCESS; 
    4343 
    4444    mgr = PJ_POOL_ALLOC_T(pool, pjmedia_converter_mgr); 
  • pjproject/trunk/pjmedia/src/pjmedia/format.c

    r3953 r4087  
    5454        return (pjmedia_audio_format_detail*) &fmt->det.aud; 
    5555    } else { 
     56        /* Get rid of unused var compiler warning if pj_assert() 
     57         * macro does not do anything 
     58         */ 
     59        PJ_UNUSED_ARG(assert_valid); 
    5660        pj_assert(!assert_valid || !"Invalid audio format detail"); 
    5761        return NULL; 
  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

    r4086 r4087  
    33723372        arrange_window(PJSUA_INVALID_ID); 
    33733373    } 
     3374#else 
     3375    PJ_UNUSED_ARG(med_idx); 
     3376    PJ_UNUSED_ARG(event); 
    33743377#endif 
    33753378} 
  • pjproject/trunk/pjsip-apps/src/pjsystest/systest.c

    r4082 r4087  
    8989/*****************************************************************/ 
    9090 
     91#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0 
    9192PJ_INLINE(char *) add_path(const char *path, const char *fname) 
    9293{ 
     
    9596    return fpath; 
    9697} 
     98#else 
     99#   define add_path(path, fname) fname 
     100#endif 
    97101 
    98102static void exit_app(void) 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

    r4071 r4087  
    26552655                                          const pj_str_t *xml_st) 
    26562656{ 
     2657#if PJMEDIA_HAS_VIDEO 
    26572658    pjsua_call *call = &pjsua_var.calls[call_id]; 
    26582659    const pj_str_t PICT_FAST_UPDATE = {"picture_fast_update", 19}; 
    26592660 
    2660 #if PJMEDIA_HAS_VIDEO 
    26612661    if (pj_strstr(xml_st, &PICT_FAST_UPDATE)) { 
    26622662        unsigned i; 
     
    26772677 
    26782678    /* Just to avoid compiler warning of unused var */ 
     2679    PJ_UNUSED_ARG(call_id); 
    26792680    PJ_UNUSED_ARG(xml_st); 
    26802681 
Note: See TracChangeset for help on using the changeset viewer.