a little more cleanup

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9821 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/languages/mod_managed/freeswitch_managed.cpp b/src/mod/languages/mod_managed/freeswitch_managed.cpp
index 8485def149b475f65b0d798ff3426bf32513d92e..f60c95a505c7052df85d4ad30e919bae675f1984 100644 (file)
--- a/src/mod/languages/mod_managed/freeswitch_managed.cpp
+++ b/src/mod/languages/mod_managed/freeswitch_managed.cpp
@@ -26,30 +26,29 @@
  * Michael Giagnocavo <mgg@packetrino.com>\r
  * Jeff Lenk <jlenk@frontiernet.net> - Modified class to support Dotnet\r
  * \r
- * freeswitch_cli.cpp -- CLI CoreSession subclasses\r
+ * freeswitch_managed.cpp -- Managed CoreSession subclasses\r
  *\r
  */  \r
 \r
-\r
 #include <switch.h>\r
 #include <switch_cpp.h>\r
-#ifndef _MANAGED\r
-#include <glib.h>\r
-#include <mono/jit/jit.h>\r
-#include <mono/metadata/assembly.h>\r
-#include <mono/metadata/environment.h>\r
-#include <mono/metadata/threads.h>\r
-#include <mono/metadata/metadata.h>\r
-#endif\r
-\r
-#include "freeswitch_managed.h"\r
 \r
 #ifdef _MANAGED\r
 #define ATTACH_THREADS\r
 #else\r
+#include <glib.h>\r
+#include <mono/metadata/threads.h>\r
 #define ATTACH_THREADS mono_thread_attach(globals.domain);\r
 #endif\r
 \r
+#ifdef WIN32\r
+#define RESULT_FREE(x) CoTaskMemFree(x)\r
+#else\r
+#define RESULT_FREE(x) g_free(x)\r
+#endif\r
+\r
+#include "freeswitch_managed.h"\r
+\r
 ManagedSession::ManagedSession():CoreSession() \r
 {\r
 \r
@@ -75,7 +74,6 @@ bool ManagedSession::end_allow_threads()
        return true;\r
 }\r
 \r
-\r
 ManagedSession::~ManagedSession() \r
 {\r
        ATTACH_THREADS\r
@@ -112,11 +110,8 @@ switch_status_t ManagedSession::run_dtmf_callback(void *input, switch_input_type
        char *result = dtmfDelegate(input, itype);\r
        switch_status_t status = process_callback_result(result);\r
 \r
-#if WIN32\r
-       CoTaskMemFree(result); \r
-#else\r
-       g_free(result)\r
-#endif\r
+       RESULT_FREE(result); \r
+\r
        return status;\r
 }\r
 \r