Changeset 4108
- Timestamp:
- Apr 27, 2012 1:32:12 AM (12 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk
- Property svn:mergeinfo changed
/pjproject/branches/1.x merged: 4103-4105,4107
- Property svn:mergeinfo changed
-
pjproject/trunk/aconfigure
r4069 r4108 6635 6635 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 6636 6636 $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; }; } 6637 as_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 6638 See \`config.log' for more details." "$LINENO" 5; } 6640 6639 fi 6641 6640 rm -f core conftest.err conftest.$ac_objext \ -
pjproject/trunk/aconfigure.ac
r4069 r4108 1112 1112 [ippStaticInit();])], 1113 1113 [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])]) 1115 1115 1116 1116 CFLAGS="$SAVED_CFLAGS" -
pjproject/trunk/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
r3553 r4108 23 23 static pj_ioqueue_key_t *key; 24 24 static pj_atomic_t *total_bytes; 25 static pj_bool_t thread_quit_flag; 25 26 26 27 struct op_key … … 146 147 } 147 148 148 for (;;) {149 while (!thread_quit_flag) { 149 150 pj_time_val timeout; 150 151 timeout.sec = 0; timeout.msec = 10; 151 152 rc = pj_ioqueue_poll(ioqueue, &timeout); 152 153 } 153 PJ_UNREACHED(return 0;)154 return 0; 154 155 } 155 156 -
pjproject/trunk/pjlib/src/pjlib-test/udp_echo_srv_sync.c
r3553 r4108 22 22 23 23 static pj_atomic_t *total_bytes; 24 static pj_bool_t thread_quit_flag = 0; 24 25 25 26 static int worker_thread(void *arg) … … 29 30 pj_status_t last_recv_err = PJ_SUCCESS, last_write_err = PJ_SUCCESS; 30 31 31 for (;;) {32 while (!thread_quit_flag) { 32 33 pj_ssize_t len; 33 34 pj_status_t rc; … … 57 58 } 58 59 } 59 PJ_UNREACHED(return 0;)60 return 0; 60 61 } 61 62 -
pjproject/trunk/pjmedia/src/pjmedia/stream.c
r4100 r4108 962 962 "Error generating RTCP SDES")); 963 963 } else { 964 len += sdes_len;964 len += (int)sdes_len; 965 965 } 966 966 } … … 1020 1020 "Error generating RTCP BYE")); 1021 1021 } else { 1022 len += bye_len;1022 len += (int)bye_len; 1023 1023 } 1024 1024 } -
pjproject/trunk/pjsip/src/pjsip/sip_resolve.c
r3553 r4108 264 264 count = 1; 265 265 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; 267 272 goto on_error; 273 } 268 274 269 275 svr_addr.entry[0].addr.addr.sa_family = (pj_uint16_t)af;
Note: See TracChangeset
for help on using the changeset viewer.