From e693a98ccc7df353e1b718cd361ba371078cbf0a Mon Sep 17 00:00:00 2001 From: Brian West Date: Thu, 16 Jul 2009 20:12:55 +0000 Subject: [PATCH] revert files git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14277 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/esl/Makefile | 3 +-- libs/esl/python/Makefile | 3 +-- libs/esl/python/esl_wrap.cpp | 3 +-- src/mod/say/mod_say_es/mod_say_es.c | 1 - src/switch_ivr.c | 1 - 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libs/esl/Makefile b/libs/esl/Makefile index 3afc3f8230..1ddcb2db07 100644 --- a/libs/esl/Makefile +++ b/libs/esl/Makefile @@ -12,8 +12,7 @@ LDFLAGS=-L. OBJS=src/esl.o src/esl_event.o src/esl_threadmutex.o src/esl_config.o SRC=src/esl.c src/esl_event.c src/esl_threadmutex.c src/esl_config.c src/esl_oop.cpp HEADERS=src/include/esl_config.h src/include/esl_event.h src/include/esl.h src/include/esl_threadmutex.h src/include/esl_oop.h -//SOLINK=-shared -Xlinker -x -SOLINK=-dynamiclib -Xlinker -x +SOLINK=-shared -Xlinker -x # comment the next line to disable c++ (no swig mods for you then) OBJS += src/esl_oop.o diff --git a/libs/esl/python/Makefile b/libs/esl/python/Makefile index 84d5243a47..a231b1e74f 100644 --- a/libs/esl/python/Makefile +++ b/libs/esl/python/Makefile @@ -1,6 +1,5 @@ LOCAL_CFLAGS=-I/usr/include/python2.4 -LOCAL_LDFLAGS=-framework python -#LOCAL_LDFLAGS=-lpython2.4 +LOCAL_LDFLAGS=-lpython2.4 all: _ESL.so diff --git a/libs/esl/python/esl_wrap.cpp b/libs/esl/python/esl_wrap.cpp index 76a6e7967d..f2090b7943 100644 --- a/libs/esl/python/esl_wrap.cpp +++ b/libs/esl/python/esl_wrap.cpp @@ -137,8 +137,7 @@ template T SwigValueInit() { /* Python.h has to appear first */ -//#include -#include +#include /* ----------------------------------------------------------------------------- * swigrun.swg diff --git a/src/mod/say/mod_say_es/mod_say_es.c b/src/mod/say/mod_say_es/mod_say_es.c index a730020d08..0f488100ab 100644 --- a/src/mod/say/mod_say_es/mod_say_es.c +++ b/src/mod/say/mod_say_es/mod_say_es.c @@ -501,7 +501,6 @@ static switch_status_t es_say(switch_core_session_t *session, char *tosay, switc } if (say_cb) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Using es callback [tosay: %s, type: %d, method: %d]\n", tosay, type, method); return say_cb(session, tosay, type, method, args); } diff --git a/src/switch_ivr.c b/src/switch_ivr.c index 313f0c64ae..78b809769e 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -2039,7 +2039,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_say(switch_core_session_t *session, c if ((si = switch_loadable_module_get_say_interface(module_name))) { /* should go back and proto all the say mods to const.... */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Using SAY Interface %s\n", module_name); status = si->say_function(session, (char *) tosay, switch_ivr_get_say_type_by_name(say_type), switch_ivr_get_say_method_by_name(say_method), args); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", module_name);