kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix python build 3/3 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16583 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2010-02-06 07:58:02 +00:00
parent 6e5f1ea9f9
commit 83487f0585
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/languages/mod_python/Makefile.in
View File

@ -21,10 +21,10 @@ reswig: swigclean mod_python_wrap.cpp
swigclean: clean swigclean: clean
rm -f mod_python_wrap.* freeswitch.py rm -f mod_python_wrap.* freeswitch.py
mod_python_wrap.cpp: mod_python_extra.c mod_python_wrap.cpp: mod_python_extra.c hack.diff
swig -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i which swig 2>&1 >>/dev/null && swig -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i
echo "#include \"mod_python_extra.c\"" >> mod_python_wrap.cpp which swig 2>&1 >>/dev/null && echo "#include \"mod_python_extra.c\"" >> mod_python_wrap.cpp
patch -s -p0 -i hack.diff which swig 2>&1 >>/dev/null && patch -s -p0 -i hack.diff
local_install: local_install:
mkdir -m755 -p $(DESTDIR)$(PYTHON_SITE_DIR) mkdir -m755 -p $(DESTDIR)$(PYTHON_SITE_DIR)

20
src/mod/languages/mod_python/mod_python_wrap.cpp
View File

@ -5555,7 +5555,9 @@ SWIGINTERN PyObject *_wrap_EventConsumer_pop__SWIG_0(PyObject *SWIGUNUSEDPARM(se
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "EventConsumer_pop" "', argument " "2"" of type '" "int""'"); SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "EventConsumer_pop" "', argument " "2"" of type '" "int""'");
} }
arg2 = static_cast< int >(val2); arg2 = static_cast< int >(val2);
Py_BEGIN_ALLOW_THREADS;
result = (Event *)(arg1)->pop(arg2); result = (Event *)(arg1)->pop(arg2);
Py_END_ALLOW_THREADS;
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_POINTER_OWN | 0 ); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_POINTER_OWN | 0 );
return resultobj; return resultobj;
fail: fail:
@ -5577,7 +5579,9 @@ SWIGINTERN PyObject *_wrap_EventConsumer_pop__SWIG_1(PyObject *SWIGUNUSEDPARM(se
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EventConsumer_pop" "', argument " "1"" of type '" "EventConsumer *""'"); SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EventConsumer_pop" "', argument " "1"" of type '" "EventConsumer *""'");
} }
arg1 = reinterpret_cast< EventConsumer * >(argp1); arg1 = reinterpret_cast< EventConsumer * >(argp1);
Py_BEGIN_ALLOW_THREADS;
result = (Event *)(arg1)->pop(); result = (Event *)(arg1)->pop();
Py_END_ALLOW_THREADS;
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_POINTER_OWN | 0 ); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_POINTER_OWN | 0 );
return resultobj; return resultobj;
fail: fail:
@ -9560,20 +9564,20 @@ fail:
} }
SWIGINTERN PyObject *_wrap_new_Session__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *_wrap_new_Session__SWIG_0(PyObject *self, PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
PYTHON::Session *result = 0 ; PYTHON::Session *result = 0 ;
if (!PyArg_ParseTuple(args,(char *)":new_Session")) SWIG_fail; if (!PyArg_ParseTuple(args,(char *)":new_Session")) SWIG_fail;
result = (PYTHON::Session *)new PYTHON::Session(); result = (PYTHON::Session *)new PYTHON::Session();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PYTHON__Session, SWIG_POINTER_NEW | 0 ); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PYTHON__Session, SWIG_POINTER_NEW | 0 ); result->setPython(self);
return resultobj; return resultobj;
fail: fail:
return NULL; return NULL;
} }
SWIGINTERN PyObject *_wrap_new_Session__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *_wrap_new_Session__SWIG_1(PyObject *self, PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
char *arg1 = (char *) 0 ; char *arg1 = (char *) 0 ;
CoreSession *arg2 = (CoreSession *) 0 ; CoreSession *arg2 = (CoreSession *) 0 ;
@ -9598,7 +9602,7 @@ SWIGINTERN PyObject *_wrap_new_Session__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
} }
arg2 = reinterpret_cast< CoreSession * >(argp2); arg2 = reinterpret_cast< CoreSession * >(argp2);
result = (PYTHON::Session *)new PYTHON::Session(arg1,arg2); result = (PYTHON::Session *)new PYTHON::Session(arg1,arg2);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PYTHON__Session, SWIG_POINTER_NEW | 0 ); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PYTHON__Session, SWIG_POINTER_NEW | 0 ); result->setPython(self);
if (alloc1 == SWIG_NEWOBJ) delete[] buf1; if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
return resultobj; return resultobj;
fail: fail:
@ -9607,7 +9611,7 @@ fail:
} }
SWIGINTERN PyObject *_wrap_new_Session__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *_wrap_new_Session__SWIG_2(PyObject *self, PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
char *arg1 = (char *) 0 ; char *arg1 = (char *) 0 ;
PYTHON::Session *result = 0 ; PYTHON::Session *result = 0 ;
@ -9623,7 +9627,7 @@ SWIGINTERN PyObject *_wrap_new_Session__SWIG_2(PyObject *SWIGUNUSEDPARM(self), P
} }
arg1 = reinterpret_cast< char * >(buf1); arg1 = reinterpret_cast< char * >(buf1);
result = (PYTHON::Session *)new PYTHON::Session(arg1); result = (PYTHON::Session *)new PYTHON::Session(arg1);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PYTHON__Session, SWIG_POINTER_NEW | 0 ); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PYTHON__Session, SWIG_POINTER_NEW | 0 ); result->setPython(self);
if (alloc1 == SWIG_NEWOBJ) delete[] buf1; if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
return resultobj; return resultobj;
fail: fail:
@ -9632,7 +9636,7 @@ fail:
} }
SWIGINTERN PyObject *_wrap_new_Session__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *_wrap_new_Session__SWIG_3(PyObject *self, PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
PYTHON::Session *result = 0 ; PYTHON::Session *result = 0 ;
@ -9647,7 +9651,7 @@ SWIGINTERN PyObject *_wrap_new_Session__SWIG_3(PyObject *SWIGUNUSEDPARM(self), P
} }
arg1 = reinterpret_cast< switch_core_session_t * >(argp1); arg1 = reinterpret_cast< switch_core_session_t * >(argp1);
result = (PYTHON::Session *)new PYTHON::Session(arg1); result = (PYTHON::Session *)new PYTHON::Session(arg1);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PYTHON__Session, SWIG_POINTER_NEW | 0 ); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PYTHON__Session, SWIG_POINTER_NEW | 0 ); result->setPython(self);
return resultobj; return resultobj;
fail: fail:
return NULL; return NULL;