Changeset 4108


Ignore:
Timestamp:
Apr 27, 2012 1:32:12 AM (8 years ago)
Author:
bennylp
Message:

Re #1474: merged r4100-4107

Location:
pjproject/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/aconfigure

    r4069 r4108  
    66356635  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 
    66366636$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    6637 { as_fn_set_status run with --help for more info 
    6638 as_fn_error "Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly 
    6639 See \`config.log' for more details." "$LINENO" 5; }; } 
     6637as_fn_error "Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info 
     6638See \`config.log' for more details." "$LINENO" 5; } 
    66406639fi 
    66416640rm -f core conftest.err conftest.$ac_objext \ 
  • pjproject/trunk/aconfigure.ac

    r4069 r4108  
    11121112                                           [ippStaticInit();])], 
    11131113                  [AC_MSG_RESULT(ok)], 
    1114                   [AC_MSG_FAILURE(Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info)]) 
     1114                  [AC_MSG_FAILURE([Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info])]) 
    11151115 
    11161116        CFLAGS="$SAVED_CFLAGS" 
  • pjproject/trunk/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c

    r3553 r4108  
    2323static pj_ioqueue_key_t *key; 
    2424static pj_atomic_t *total_bytes; 
     25static pj_bool_t thread_quit_flag; 
    2526 
    2627struct op_key 
     
    146147    } 
    147148     
    148     for (;;) { 
     149    while (!thread_quit_flag) { 
    149150        pj_time_val timeout; 
    150151        timeout.sec = 0; timeout.msec = 10; 
    151152        rc = pj_ioqueue_poll(ioqueue, &timeout); 
    152153    } 
    153     PJ_UNREACHED(return 0;) 
     154    return 0; 
    154155} 
    155156 
  • pjproject/trunk/pjlib/src/pjlib-test/udp_echo_srv_sync.c

    r3553 r4108  
    2222 
    2323static pj_atomic_t *total_bytes; 
     24static pj_bool_t thread_quit_flag = 0; 
    2425 
    2526static int worker_thread(void *arg) 
     
    2930    pj_status_t  last_recv_err = PJ_SUCCESS, last_write_err = PJ_SUCCESS; 
    3031 
    31     for (;;) { 
     32    while (!thread_quit_flag) { 
    3233        pj_ssize_t len; 
    3334        pj_status_t rc; 
     
    5758        } 
    5859    } 
    59     PJ_UNREACHED(return 0;) 
     60    return 0; 
    6061} 
    6162 
  • pjproject/trunk/pjmedia/src/pjmedia/stream.c

    r4100 r4108  
    962962                                     "Error generating RTCP SDES")); 
    963963        } else { 
    964             len += sdes_len; 
     964            len += (int)sdes_len; 
    965965        } 
    966966    } 
     
    10201020                                     "Error generating RTCP BYE")); 
    10211021        } else { 
    1022             len += bye_len; 
     1022            len += (int)bye_len; 
    10231023        } 
    10241024    } 
  • pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

    r3553 r4108  
    264264            count = 1; 
    265265            status = pj_getaddrinfo(af, &target->addr.host, &count, &ai); 
    266             if (status != PJ_SUCCESS) 
     266            if (status != PJ_SUCCESS) { 
     267                /* "Normalize" error to PJ_ERESOLVE. This is a special error 
     268                 * because it will be translated to SIP status 502 by 
     269                 * sip_transaction.c 
     270                 */ 
     271                status = PJ_ERESOLVE; 
    267272                goto on_error; 
     273            } 
    268274 
    269275            svr_addr.entry[0].addr.addr.sa_family = (pj_uint16_t)af; 
Note: See TracChangeset for help on using the changeset viewer.