diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-02-09 14:38:30 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-02-09 14:38:30 +0000 |
| commit | 333fbd7e724d93411250a86659eca9f14d6ff5c8 (patch) | |
| tree | 6dbfeeb75efe5e4ded677cf42216909778928a0f /pjsip | |
| parent | 34f4ce979c4d04a00460988325dc3c28748f1834 (diff) | |
Failed attempt to build pjmedia with DirectSound on Linux
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@171 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/build/Makefile | 2 | ||||
| -rw-r--r-- | pjsip/include/pjsip/sip_types.h | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsip-ua/sip_inv.c | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsua/pjsua_core.c | 6 |
4 files changed, 7 insertions, 5 deletions
diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index 8170cd93..976ef8f8 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -54,7 +54,7 @@ export PJSIP_UA_CFLAGS += $(_CFLAGS) # export PJSUA_SRCDIR = ../src/pjsua export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - main.o pjsua_reg.o pjsua_core.o + main.o pjsua_reg.o pjsua_inv.o pjsua_core.o export PJSUA_CFLAGS += $(_CFLAGS) export PJSUA_LDFLAGS += $(_LDFLAGS) export PJSUA_EXE:=../bin/pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE) diff --git a/pjsip/include/pjsip/sip_types.h b/pjsip/include/pjsip/sip_types.h index a77f2550..8ea6c414 100644 --- a/pjsip/include/pjsip/sip_types.h +++ b/pjsip/include/pjsip/sip_types.h @@ -136,7 +136,7 @@ typedef struct pjsip_dialog pjsip_dialog; /** * Dialog state (sip_dialog.h). */ -enum pjsip_dialog_state pjsip_dialog_state; +typedef enum pjsip_dialog_state pjsip_dialog_state; /** * Transaction role. diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c index d551ee70..fede7da6 100644 --- a/pjsip/src/pjsip-ua/sip_inv.c +++ b/pjsip/src/pjsip-ua/sip_inv.c @@ -1578,6 +1578,8 @@ static void inv_on_state_calling( pjsip_inv_session *inv, pjsip_event *e) } break; + default: + break; } } } diff --git a/pjsip/src/pjsua/pjsua_core.c b/pjsip/src/pjsua/pjsua_core.c index 7eb414bc..3bdf94ee 100644 --- a/pjsip/src/pjsua/pjsua_core.c +++ b/pjsip/src/pjsua/pjsua_core.c @@ -561,9 +561,9 @@ pj_status_t pjsua_start(void) /* With the user part. */ len = pj_snprintf(contact, sizeof(contact), "<sip:%.*s@%.*s:%d>", - sip_uri->user.slen, + (int)sip_uri->user.slen, sip_uri->user.ptr, - udp_transport->local_name.host.slen, + (int)udp_transport->local_name.host.slen, udp_transport->local_name.host.ptr, udp_transport->local_name.port); } else { @@ -572,7 +572,7 @@ pj_status_t pjsua_start(void) len = pj_snprintf(contact, sizeof(contact), "<sip:%.*s:%d>", - udp_transport->local_name.host.slen, + (int)udp_transport->local_name.host.slen, udp_transport->local_name.host.ptr, udp_transport->local_name.port); } |