1
0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-05 18:13:27 +00:00

Merge pull request from signalwire/python3

[mod_python3] Fix switch module definition preventing mod_python3 from loading.
This commit is contained in:
Andrey Volk 2021-10-21 01:59:44 +03:00 committed by GitHub
commit f26522f102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -58,9 +58,9 @@ static void set_max_recursion_depth(void);
static switch_api_interface_t python_run_interface; static switch_api_interface_t python_run_interface;
static void print_python_error(const char * script); static void print_python_error(const char * script);
SWITCH_MODULE_LOAD_FUNCTION(mod_python_load); SWITCH_MODULE_LOAD_FUNCTION(mod_python3_load);
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_python_shutdown); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_python3_shutdown);
SWITCH_MODULE_DEFINITION_EX(mod_python, mod_python_load, mod_python_shutdown, NULL, SMODF_GLOBAL_SYMBOLS); SWITCH_MODULE_DEFINITION_EX(mod_python3, mod_python3_load, mod_python3_shutdown, NULL, SMODF_GLOBAL_SYMBOLS);
static struct { static struct {
switch_memory_pool_t *pool; switch_memory_pool_t *pool;
@ -535,7 +535,7 @@ SWITCH_STANDARD_CHAT_APP(python_chat_function)
} }
SWITCH_MODULE_LOAD_FUNCTION(mod_python_load) SWITCH_MODULE_LOAD_FUNCTION(mod_python3_load)
{ {
switch_api_interface_t *api_interface; switch_api_interface_t *api_interface;
switch_application_interface_t *app_interface; switch_application_interface_t *app_interface;
@ -595,7 +595,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_python_load)
/* /*
Called when the system shuts down*/ Called when the system shuts down*/
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_python_shutdown) SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_python3_shutdown)
{ {
PyInterpreterState *mainInterpreterState; PyInterpreterState *mainInterpreterState;
PyThreadState *myThreadState; PyThreadState *myThreadState;