提交 ee7498b4 authored 作者: Michael Jerris's avatar Michael Jerris

a little more cleanup

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9824 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 76b7744a
...@@ -41,19 +41,21 @@ SWITCH_BEGIN_EXTERN_C ...@@ -41,19 +41,21 @@ SWITCH_BEGIN_EXTERN_C
typedef void (*hangupFunction)(void); typedef void (*hangupFunction)(void);
typedef char* (*inputFunction)(void*, switch_input_type_t); typedef char* (*inputFunction)(void*, switch_input_type_t);
#ifdef _MANAGED #ifndef _MANAGED
#define ATTACH_THREADS
#else
#include <glib.h> #include <glib.h>
#include <mono/jit/jit.h> #include <mono/jit/jit.h>
#include <mono/metadata/assembly.h> #include <mono/metadata/assembly.h>
#include <mono/metadata/environment.h>
#include <mono/metadata/threads.h> #include <mono/metadata/threads.h>
#include <mono/metadata/debug-helpers.h>
#endif
#ifndef SWIG #ifndef SWIG
struct mod_mono_globals { struct mod_managed_globals {
switch_memory_pool_t *pool;
#ifndef _MANAGED
MonoDomain *domain; MonoDomain *domain;
MonoAssembly *mod_mono_asm; MonoAssembly *mod_mono_asm;
switch_memory_pool_t *pool;
switch_bool_t embedded; switch_bool_t embedded;
MonoMethod *loadMethod; MonoMethod *loadMethod;
...@@ -61,11 +63,15 @@ struct mod_mono_globals { ...@@ -61,11 +63,15 @@ struct mod_mono_globals {
MonoMethod *runMethod; MonoMethod *runMethod;
MonoMethod *executeMethod; MonoMethod *executeMethod;
MonoMethod *executeBackgroundMethod; MonoMethod *executeBackgroundMethod;
#endif
}; };
typedef struct mod_managed_globals mod_managed_globals;
typedef struct mod_mono_globals mod_mono_globals; extern mod_managed_globals globals;
extern mod_mono_globals globals;
#endif #endif
#ifdef _MANAGED
#define ATTACH_THREADS
#else
#define ATTACH_THREADS mono_thread_attach(globals.domain); #define ATTACH_THREADS mono_thread_attach(globals.domain);
#endif #endif
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论