a little more cleanup

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9822 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 f60c95a505c7052df85d4ad30e919bae675f1984..2e2a7106dfd6a8d67ddb9a20168ca87b2a513d65 100644 (file)
--- a/src/mod/languages/mod_managed/freeswitch_managed.cpp
+++ b/src/mod/languages/mod_managed/freeswitch_managed.cpp
@@ -32,21 +32,6 @@
 \r
 #include <switch.h>\r
 #include <switch_cpp.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

diff --git a/src/mod/languages/mod_managed/freeswitch_managed.h b/src/mod/languages/mod_managed/freeswitch_managed.h
index c5fc57b7ead2587679852d2b13f002b1ebb77d5b..9f5ff2b742d9518c3db5e03e19d6d56a2ae96c81 100644 (file)
--- a/src/mod/languages/mod_managed/freeswitch_managed.h
+++ b/src/mod/languages/mod_managed/freeswitch_managed.h
@@ -26,12 +26,12 @@
  * Michael Giagnocavo <mgg@packetrino.com>\r
  * Jeff Lenk <jlenk@frontiernet.net> - Modified class to support Dotnet\r
  * \r
- * freeswitch_mono.h -- Header for MonoSession and globals\r
+ * freeswitch_managed.h -- Header for ManagedSession and globals\r
  *\r
  */\r
 \r
-#ifndef FREESWITCH_MONO_H\r
-#define FREESWITCH_MONO_H\r
+#ifndef FREESWITCH_MANAGED_H\r
+#define FREESWITCH_MANAGED_H\r
 \r
 SWITCH_BEGIN_EXTERN_C\r
 \r
@@ -41,10 +41,13 @@ SWITCH_BEGIN_EXTERN_C
 typedef void (*hangupFunction)(void);\r
 typedef char* (*inputFunction)(void*, switch_input_type_t);\r
 \r
-#ifndef _MANAGED\r
-\r
+#ifdef _MANAGED\r
+#define ATTACH_THREADS\r
+#else\r
+#include <glib.h>\r
 #include <mono/jit/jit.h>\r
 #include <mono/metadata/assembly.h>\r
+#include <mono/metadata/threads.h>\r
 \r
 #ifndef SWIG\r
 struct mod_mono_globals {\r
@@ -63,6 +66,13 @@ struct mod_mono_globals {
 typedef struct mod_mono_globals mod_mono_globals;\r
 extern mod_mono_globals globals;\r
 #endif\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
 SWITCH_END_EXTERN_C\r