diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-06-14 20:22:31 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-06-14 20:22:31 +0000 |
| commit | b320c9cc527559a18a666cc6143bd3f602da6ec7 (patch) | |
| tree | 872d347fab838589b8366b5771c02042681ddac8 /pjsip | |
| parent | 503491acaba61cc45c9a9da08da49402143af8bf (diff) | |
Fixed new pjsua build/makefiles
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@508 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/build/Makefile | 5 | ||||
| -rw-r--r-- | pjsip/src/pjsip/sip_transaction.c | 4 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_call.c | 12 |
3 files changed, 10 insertions, 11 deletions
diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index f5ec6d8c..1fd183aa 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -70,9 +70,8 @@ export PJSIP_SIMPLE_CFLAGS += $(_CFLAGS) # export PJSUA_LIB_SRCDIR = ../src/pjsua-lib export PJSUA_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - pjsua_call.o pjsua_core.o pjsua_im.o \ - pjsua_pres.o pjsua_reg.o pjsua_settings.o \ - pjsua_console_app.o + pjsua_acc.o pjsua_call.o pjsua_core.o \ + pjsua_im.o pjsua_media.o pjsua_pres.o export PJSUA_LIB_CFLAGS += $(_CFLAGS) diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c index efbac0a7..3bdb26da 100644 --- a/pjsip/src/pjsip/sip_transaction.c +++ b/pjsip/src/pjsip/sip_transaction.c @@ -1328,8 +1328,8 @@ PJ_DEF(pj_status_t) pjsip_tsx_create_uas( pjsip_module *tsx_user, /* * Set transaction status code and reason. */ -static tsx_set_status_code(pjsip_transaction *tsx, - int code, const pj_str_t *reason) +static void tsx_set_status_code(pjsip_transaction *tsx, + int code, const pj_str_t *reason) { tsx->status_code = code; if (reason) diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index 92c1f92e..208cb97e 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -1259,7 +1259,7 @@ static void dump_media_session(const char *indent, len = pj_ansi_snprintf(buf, end-p, "%s #%d %.*s @%dKHz, %s, peer=%s:%d", indent, i, - info.stream_info[i].fmt.encoding_name.slen, + (int)info.stream_info[i].fmt.encoding_name.slen, info.stream_info[i].fmt.encoding_name.ptr, info.stream_info[i].fmt.clock_rate / 1000, dir, @@ -1502,11 +1502,11 @@ PJ_DEF(pj_status_t) pjsua_call_dump( pjsua_call_id call_id, "%s Call time: %02dh:%02dm:%02ds, " "1st res in %d ms, conn in %dms", indent, - (duration.sec / 3600), - ((duration.sec % 3600)/60), - (duration.sec % 60), - PJ_TIME_VAL_MSEC(res_delay), - PJ_TIME_VAL_MSEC(con_delay)); + (int)(duration.sec / 3600), + (int)((duration.sec % 3600)/60), + (int)(duration.sec % 60), + (int)PJ_TIME_VAL_MSEC(res_delay), + (int)PJ_TIME_VAL_MSEC(con_delay)); if (len > 0 && len < end-p) { p += len; |