From 9a1157078fa0416cdca817195a75850b66ef00f7 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 23 Dec 2013 23:24:53 +0500 Subject: [PATCH] FS-6061 swigall --- src/include/switch_cpp.h | 2 +- src/mod/languages/mod_lua/mod_lua_wrap.cpp | 6 +++--- src/mod/languages/mod_managed/freeswitch_wrap.cxx | 2 +- src/mod/languages/mod_perl/mod_perl_wrap.cpp | 2 +- src/mod/languages/mod_python/mod_python_wrap.cpp | 4 +++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h index bccf71a3a1..7f3073192b 100644 --- a/src/include/switch_cpp.h +++ b/src/include/switch_cpp.h @@ -397,7 +397,7 @@ SWITCH_DECLARE(bool) email(char *to, char *from, char *headers = NULL, char *bod SWITCH_DECLARE(void) console_log(char *level_str, char *msg); SWITCH_DECLARE(void) console_clean_log(char *msg); -SWITCH_DECLARE(void) msleep(unsigned ms); +SWITCH_DECLARE(void) switch_msleep(unsigned ms); /** \brief bridge the audio of session_b into session_a * diff --git a/src/mod/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/languages/mod_lua/mod_lua_wrap.cpp index 130eab949a..5335321b82 100644 --- a/src/mod/languages/mod_lua/mod_lua_wrap.cpp +++ b/src/mod/languages/mod_lua/mod_lua_wrap.cpp @@ -6292,10 +6292,10 @@ static int _wrap_msleep(lua_State* L) { int SWIG_arg = -1; unsigned int arg1 ; - SWIG_check_num_args("msleep",1,1) - if(!lua_isnumber(L,1)) SWIG_fail_arg("msleep",1,"unsigned int"); + SWIG_check_num_args("switch_msleep",1,1) + if(!lua_isnumber(L,1)) SWIG_fail_arg("switch_msleep",1,"unsigned int"); arg1 = (unsigned int)lua_tonumber(L, 1); - msleep(arg1); + switch_msleep(arg1); SWIG_arg=0; return SWIG_arg; diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx index a87727c989..f26e751a52 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx @@ -41502,7 +41502,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_msleep(unsigned int jarg1) { unsigned int arg1 ; arg1 = (unsigned int)jarg1; - msleep(arg1); + switch_msleep(arg1); } diff --git a/src/mod/languages/mod_perl/mod_perl_wrap.cpp b/src/mod/languages/mod_perl/mod_perl_wrap.cpp index 6f1b81cabe..12147ed95c 100644 --- a/src/mod/languages/mod_perl/mod_perl_wrap.cpp +++ b/src/mod/languages/mod_perl/mod_perl_wrap.cpp @@ -8183,7 +8183,7 @@ XS(_wrap_msleep) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "msleep" "', argument " "1"" of type '" "unsigned int""'"); } arg1 = static_cast< unsigned int >(val1); - msleep(arg1); + switch_msleep(arg1); XSRETURN(argvi); diff --git a/src/mod/languages/mod_python/mod_python_wrap.cpp b/src/mod/languages/mod_python/mod_python_wrap.cpp index caecd70d5b..b7c0e195b2 100644 --- a/src/mod/languages/mod_python/mod_python_wrap.cpp +++ b/src/mod/languages/mod_python/mod_python_wrap.cpp @@ -5585,7 +5585,9 @@ SWIGINTERN PyObject *_wrap_EventConsumer_pop(PyObject *SWIGUNUSEDPARM(self), PyO } arg3 = static_cast< int >(val3); } + Py_BEGIN_ALLOW_THREADS; result = (Event *)(arg1)->pop(arg2,arg3); + Py_END_ALLOW_THREADS; resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_POINTER_OWN | 0 ); return resultobj; fail: @@ -8387,7 +8389,7 @@ SWIGINTERN PyObject *_wrap_msleep(PyObject *SWIGUNUSEDPARM(self), PyObject *args SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "msleep" "', argument " "1"" of type '" "unsigned int""'"); } arg1 = static_cast< unsigned int >(val1); - msleep(arg1); + switch_msleep(arg1); resultobj = SWIG_Py_Void(); return resultobj; fail: