forked from Mirrors/freeswitch
merged revisions 855:895 from openzap/trunk
git-svn-id: http://svn.openzap.org/svn/openzap/branches/sangoma_boost@897 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
parent
e508938675
commit
fda2c273d0
@ -33,7 +33,7 @@ PREFIX = $(prefix)
|
||||
SRC = src
|
||||
|
||||
moddir = @modinstdir@
|
||||
libdir = $(PREFIX)/lib/
|
||||
libdir = @libdir@
|
||||
library_includedir = $(PREFIX)/include
|
||||
|
||||
INCS = -I$(OZ_SRCDIR)/$(SRC)/include -I$(OZ_SRCDIR)/$(SRC)/isdn/include
|
||||
|
@ -19,7 +19,7 @@ detect-callwaiting-cas => 2750,2130
|
||||
|
||||
detect-fail1 => 913.8
|
||||
detect-fail2 => 1370.6
|
||||
detect-fail3 => 776.7
|
||||
detect-fail3 => 1776.7
|
||||
|
||||
|
||||
|
||||
|
@ -125,7 +125,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
|
||||
switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session,
|
||||
switch_memory_pool_t **pool,
|
||||
switch_originate_flag_t flags);
|
||||
switch_originate_flag_t flags, switch_call_cause_t *cancel_cause);
|
||||
static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
|
||||
static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
|
||||
static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
|
||||
@ -1028,7 +1028,7 @@ that allocate memory or you will have 1 channel with memory allocated from anoth
|
||||
static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event,
|
||||
switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session, switch_memory_pool_t **pool,
|
||||
switch_originate_flag_t flags)
|
||||
switch_originate_flag_t flags, switch_call_cause_t *cancel_cause)
|
||||
{
|
||||
|
||||
const char *dest = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user