Merge remote branch 'fsorig/master'
This commit is contained in:
commit
e4e879affb
|
@ -16,9 +16,7 @@ SOLINK=-shared -Xlinker -x
|
||||||
# comment the next line to disable c++ (no swig mods for you then)
|
# comment the next line to disable c++ (no swig mods for you then)
|
||||||
OBJS += src/esl_oop.o
|
OBJS += src/esl_oop.o
|
||||||
|
|
||||||
all: $(MYLIB) fs_cli testclient testserver ivrd pymod
|
all: $(MYLIB) fs_cli testclient testserver ivrd
|
||||||
|
|
||||||
install: pymod-install
|
|
||||||
|
|
||||||
$(MYLIB): $(OBJS) $(HEADERS) $(SRC)
|
$(MYLIB): $(OBJS) $(HEADERS) $(SRC)
|
||||||
ar rcs $(MYLIB) $(OBJS)
|
ar rcs $(MYLIB) $(OBJS)
|
||||||
|
|
|
@ -28636,7 +28636,7 @@ namespace FreeSWITCH.Native {
|
||||||
SWITCH_RTP_FLAG_BREAK = (1 << 10),
|
SWITCH_RTP_FLAG_BREAK = (1 << 10),
|
||||||
SWITCH_RTP_FLAG_UDPTL = (1 << 11),
|
SWITCH_RTP_FLAG_UDPTL = (1 << 11),
|
||||||
SWITCH_RTP_FLAG_DATAWAIT = (1 << 12),
|
SWITCH_RTP_FLAG_DATAWAIT = (1 << 12),
|
||||||
SWITCH_RTP_FLAG_BUGGY_2833 = (1 << 13),
|
SWITCH_RTP_FLAG_BYTESWAP = (1 << 13),
|
||||||
SWITCH_RTP_FLAG_PASS_RFC2833 = (1 << 14),
|
SWITCH_RTP_FLAG_PASS_RFC2833 = (1 << 14),
|
||||||
SWITCH_RTP_FLAG_AUTO_CNG = (1 << 15),
|
SWITCH_RTP_FLAG_AUTO_CNG = (1 << 15),
|
||||||
SWITCH_RTP_FLAG_SECURE_SEND_RESET = (1 << 16),
|
SWITCH_RTP_FLAG_SECURE_SEND_RESET = (1 << 16),
|
||||||
|
|
|
@ -9899,17 +9899,17 @@ XS(SWIG_init) {
|
||||||
SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu");
|
SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu");
|
||||||
SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API");
|
SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API");
|
||||||
SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t");
|
SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t");
|
||||||
/*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
|
/*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
|
||||||
SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI);
|
SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI);
|
||||||
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP)));
|
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP)));
|
||||||
SvREADONLY_on(sv);
|
SvREADONLY_on(sv);
|
||||||
} while(0) /*@SWIG@*/;
|
} while(0) /*@SWIG@*/;
|
||||||
/*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
|
/*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
|
||||||
SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI);
|
SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI);
|
||||||
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE)));
|
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE)));
|
||||||
SvREADONLY_on(sv);
|
SvREADONLY_on(sv);
|
||||||
} while(0) /*@SWIG@*/;
|
} while(0) /*@SWIG@*/;
|
||||||
/*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
|
/*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
|
||||||
SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI);
|
SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI);
|
||||||
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK)));
|
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK)));
|
||||||
SvREADONLY_on(sv);
|
SvREADONLY_on(sv);
|
||||||
|
|
Loading…
Reference in New Issue