kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-27 19:53:55 +00:00
Code Issues Projects Releases Wiki Activity

FS-10427: move mod_perl to use swig3.0 so we can reswig on debian9

Browse Source
This commit is contained in:
Mike Jerris 2017-06-27 12:32:17 -05:00
parent 057dcfbc2f
commit 38a215d237
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/languages/mod_perl/Makefile.am
View File

@ -23,7 +23,7 @@ swigclean: clean
rm -f mod_perl_wrap.* freeswitch.so freeswitch.pm rm -f mod_perl_wrap.* freeswitch.so freeswitch.pm
mod_perl_wrap.cpp: mod_perl_wrap.cpp:
swig2.0 -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i swig3.0 -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
echo "#include \"mod_perl_extra.c\"" >> mod_perl_wrap.cpp echo "#include \"mod_perl_extra.c\"" >> mod_perl_wrap.cpp
patch -s -p0 -i hack.diff patch -s -p0 -i hack.diff

2
src/mod/languages/mod_perl/freeswitch.pm
View File

@ -1,5 +1,5 @@
# This file was automatically generated by SWIG (http://www.swig.org). # This file was automatically generated by SWIG (http://www.swig.org).
# Version 2.0.12 # Version 3.0.2
# #
# Do not make changes to this file unless you know what you are doing--modify # Do not make changes to this file unless you know what you are doing--modify
# the SWIG interface file instead. # the SWIG interface file instead.

46
src/mod/languages/mod_perl/mod_perl_wrap.cpp
View File

@ -1,6 +1,6 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org). * This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.12 * Version 3.0.2
* *
* This file is not intended to be easily readable and contains a number of * This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make * coding conventions designed to improve portability and efficiency. Do not make
@ -550,14 +550,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
swig_module_info *iter = start; swig_module_info *iter = start;
do { do {
if (iter->size) { if (iter->size) {
register size_t l = 0; size_t l = 0;
register size_t r = iter->size - 1; size_t r = iter->size - 1;
do { do {
/* since l+r >= 0, we can (>> 1) instead (/ 2) */ /* since l+r >= 0, we can (>> 1) instead (/ 2) */
register size_t i = (l + r) >> 1; size_t i = (l + r) >> 1;
const char *iname = iter->types[i]->name; const char *iname = iter->types[i]->name;
if (iname) { if (iname) {
register int compare = strcmp(name, iname); int compare = strcmp(name, iname);
if (compare == 0) { if (compare == 0) {
return iter->types[i]; return iter->types[i];
} else if (compare < 0) { } else if (compare < 0) {
@ -601,7 +601,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
of the str field (the human readable name) */ of the str field (the human readable name) */
swig_module_info *iter = start; swig_module_info *iter = start;
do { do {
register size_t i = 0; size_t i = 0;
for (; i < iter->size; ++i) { for (; i < iter->size; ++i) {
if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
return iter->types[i]; return iter->types[i];
@ -620,10 +620,10 @@ SWIG_TypeQueryModule(swig_module_info *start,
SWIGRUNTIME char * SWIGRUNTIME char *
SWIG_PackData(char *c, void *ptr, size_t sz) { SWIG_PackData(char *c, void *ptr, size_t sz) {
static const char hex[17] = "0123456789abcdef"; static const char hex[17] = "0123456789abcdef";
register const unsigned char *u = (unsigned char *) ptr; const unsigned char *u = (unsigned char *) ptr;
register const unsigned char *eu = u + sz; const unsigned char *eu = u + sz;
for (; u != eu; ++u) { for (; u != eu; ++u) {
register unsigned char uu = *u; unsigned char uu = *u;
*(c++) = hex[(uu & 0xf0) >> 4]; *(c++) = hex[(uu & 0xf0) >> 4];
*(c++) = hex[uu & 0xf]; *(c++) = hex[uu & 0xf];
} }
@ -635,11 +635,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
*/ */
SWIGRUNTIME const char * SWIGRUNTIME const char *
SWIG_UnpackData(const char *c, void *ptr, size_t sz) { SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
register unsigned char *u = (unsigned char *) ptr; unsigned char *u = (unsigned char *) ptr;
register const unsigned char *eu = u + sz; const unsigned char *eu = u + sz;
for (; u != eu; ++u) { for (; u != eu; ++u) {
register char d = *(c++); char d = *(c++);
register unsigned char uu; unsigned char uu;
if ((d >= '0') && (d <= '9')) if ((d >= '0') && (d <= '9'))
uu = ((d - '0') << 4); uu = ((d - '0') << 4);
else if ((d >= 'a') && (d <= 'f')) else if ((d >= 'a') && (d <= 'f'))
@ -894,6 +894,7 @@ SWIG_Perl_ErrorType(int code) {
#define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Perl_ConvertPtr(SWIG_PERL_OBJECT_CALL obj, pp, type, flags) #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Perl_ConvertPtr(SWIG_PERL_OBJECT_CALL obj, pp, type, flags)
#define SWIG_ConvertPtrAndOwn(obj, pp, type, flags,own) SWIG_Perl_ConvertPtrAndOwn(SWIG_PERL_OBJECT_CALL obj, pp, type, flags, own) #define SWIG_ConvertPtrAndOwn(obj, pp, type, flags,own) SWIG_Perl_ConvertPtrAndOwn(SWIG_PERL_OBJECT_CALL obj, pp, type, flags, own)
#define SWIG_NewPointerObj(p, type, flags) SWIG_Perl_NewPointerObj(SWIG_PERL_OBJECT_CALL p, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Perl_NewPointerObj(SWIG_PERL_OBJECT_CALL p, type, flags)
#define swig_owntype int
/* for raw packed data */ /* for raw packed data */
#define SWIG_ConvertPacked(obj, p, s, type) SWIG_Perl_ConvertPacked(SWIG_PERL_OBJECT_CALL obj, p, s, type) #define SWIG_ConvertPacked(obj, p, s, type) SWIG_Perl_ConvertPacked(SWIG_PERL_OBJECT_CALL obj, p, s, type)
@ -1162,7 +1163,11 @@ SWIG_Perl_ConvertPtrAndOwn(SWIG_MAYBE_PERL_OBJECT SV *sv, void **ptr, swig_type_
/* Now see if the types match */ /* Now see if the types match */
char *_c = HvNAME(SvSTASH(SvRV(sv))); char *_c = HvNAME(SvSTASH(SvRV(sv)));
tc = SWIG_TypeProxyCheck(_c,_t); tc = SWIG_TypeProxyCheck(_c,_t);
#ifdef SWIG_DIRECTORS
if (!tc && !sv_derived_from(sv,SWIG_Perl_TypeProxyName(_t))) {
#else
if (!tc) { if (!tc) {
#endif
return SWIG_ERROR; return SWIG_ERROR;
} }
{ {
@ -1544,7 +1549,7 @@ static swig_module_info swig_module = {swig_types, 29, 0, 0, 0, 0};
#define SWIG_name "freeswitchc::boot_freeswitch" #define SWIG_name "freeswitchc::boot_freeswitch"
#define SWIG_prefix "freeswitchc::" #define SWIG_prefix "freeswitchc::"
#define SWIGVERSION 0x020012 #define SWIGVERSION 0x030002
#define SWIG_VERSION SWIGVERSION #define SWIG_VERSION SWIGVERSION
@ -1822,7 +1827,8 @@ SWIG_AsCharArray(SV * obj, char *val, size_t size)
char* cptr = 0; size_t csize = 0; int alloc = SWIG_OLDOBJ; char* cptr = 0; size_t csize = 0; int alloc = SWIG_OLDOBJ;
int res = SWIG_AsCharPtrAndSize(obj, &cptr, &csize, &alloc); int res = SWIG_AsCharPtrAndSize(obj, &cptr, &csize, &alloc);
if (SWIG_IsOK(res)) { if (SWIG_IsOK(res)) {
if ((csize == size + 1) && cptr && !(cptr[csize-1])) --csize; /* special case of single char conversion when we don't need space for NUL */
if (size == 1 && csize == 2 && cptr && !cptr[1]) --csize;
if (csize <= size) { if (csize <= size) {
if (val) { if (val) {
if (csize) memcpy(val, cptr, csize*sizeof(char)); if (csize) memcpy(val, cptr, csize*sizeof(char));
@ -4819,7 +4825,7 @@ XS(_wrap_EventConsumer_enodes_set) {
{ {
if (arg2) { if (arg2) {
size_t ii = 0; size_t ii = 0;
for (; ii < (size_t)SWITCH_EVENT_ALL+1; ++ii) arg1->enodes[ii] = arg2[ii]; for (; ii < (size_t)SWITCH_EVENT_ALL+1; ++ii) *(switch_event_node_t * *)&arg1->enodes[ii] = *((switch_event_node_t * *)arg2 + ii);
} else { } else {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""enodes""' of type '""switch_event_node_t *[SWITCH_EVENT_ALL+1]""'"); SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""enodes""' of type '""switch_event_node_t *[SWITCH_EVENT_ALL+1]""'");
} }
@ -10509,7 +10515,7 @@ static swig_command_info swig_commands[] = {
* array with the correct data and linking the correct swig_cast_info * array with the correct data and linking the correct swig_cast_info
* structures together. * structures together.
* *
* The generated swig_type_info structures are assigned staticly to an initial * The generated swig_type_info structures are assigned statically to an initial
* array. We just loop through that array, and handle each type individually. * array. We just loop through that array, and handle each type individually.
* First we lookup if this type has been already loaded, and if so, use the * First we lookup if this type has been already loaded, and if so, use the
* loaded structure instead of the generated one. Then we have to fill in the * loaded structure instead of the generated one. Then we have to fill in the
@ -10794,17 +10800,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/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { /*@SWIG:/usr/share/swig3.0/perl5/perltypemaps.swg,65,%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/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { /*@SWIG:/usr/share/swig3.0/perl5/perltypemaps.swg,65,%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/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { /*@SWIG:/usr/share/swig3.0/perl5/perltypemaps.swg,65,%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);