From 01a029de9956f28bd794e193e1f06ff2f808b26a Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sat, 4 Oct 2008 04:58:20 +0000 Subject: [PATCH] a little more cleanup git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9821 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- .../mod_managed/freeswitch_managed.cpp | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/mod/languages/mod_managed/freeswitch_managed.cpp b/src/mod/languages/mod_managed/freeswitch_managed.cpp index 8485def149..f60c95a505 100644 --- a/src/mod/languages/mod_managed/freeswitch_managed.cpp +++ b/src/mod/languages/mod_managed/freeswitch_managed.cpp @@ -26,30 +26,29 @@ * Michael Giagnocavo * Jeff Lenk - Modified class to support Dotnet * - * freeswitch_cli.cpp -- CLI CoreSession subclasses + * freeswitch_managed.cpp -- Managed CoreSession subclasses * */ - #include #include -#ifndef _MANAGED -#include -#include -#include -#include -#include -#include -#endif - -#include "freeswitch_managed.h" #ifdef _MANAGED #define ATTACH_THREADS #else +#include +#include #define ATTACH_THREADS mono_thread_attach(globals.domain); #endif +#ifdef WIN32 +#define RESULT_FREE(x) CoTaskMemFree(x) +#else +#define RESULT_FREE(x) g_free(x) +#endif + +#include "freeswitch_managed.h" + ManagedSession::ManagedSession():CoreSession() { @@ -75,7 +74,6 @@ bool ManagedSession::end_allow_threads() return true; } - ManagedSession::~ManagedSession() { ATTACH_THREADS @@ -112,11 +110,8 @@ switch_status_t ManagedSession::run_dtmf_callback(void *input, switch_input_type char *result = dtmfDelegate(input, itype); switch_status_t status = process_callback_result(result); -#if WIN32 - CoTaskMemFree(result); -#else - g_free(result) -#endif + RESULT_FREE(result); + return status; }