Author: mikej Date: Fri Oct 3 13:05:57 2008 New Revision: 9809 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h Log: define those only for the clr managed code. Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h Fri Oct 3 13:05:57 2008 @@ -42,6 +42,32 @@ typedef char* (*inputFunction)(void*, switch_input_type_t); #ifndef _MANAGED + +#include <mono/jit/jit.h> +#include <mono/metadata/assembly.h> + +#ifndef SWIG +struct mod_mono_globals { + MonoDomain *domain; + MonoAssembly *mod_mono_asm; + switch_memory_pool_t *pool; + switch_bool_t embedded; + + MonoMethod *loadMethod; + MonoMethod *unloadMethod; + MonoMethod *runMethod; + MonoMethod *executeMethod; + MonoMethod *executeBackgroundMethod; +}; + +typedef struct mod_mono_globals mod_mono_globals; +extern mod_mono_globals globals; +#endif +#endif + +SWITCH_END_EXTERN_C + +#ifdef _MANAGED // this section remove linker error LNK4248 for these opaque structures struct switch_core_session {char foo[];}; struct apr_pool_t {char foo[];}; @@ -72,32 +98,6 @@ struct apr_socket_t {char foo[];}; // LNK Error -#include <mono/jit/jit.h> -#include <mono/metadata/assembly.h> - -#ifndef SWIG -struct mod_mono_globals { - MonoDomain *domain; - MonoAssembly *mod_mono_asm; - switch_memory_pool_t *pool; - switch_bool_t embedded; - - MonoMethod *loadMethod; - MonoMethod *unloadMethod; - MonoMethod *runMethod; - MonoMethod *executeMethod; - MonoMethod *executeBackgroundMethod; -}; - -typedef struct mod_mono_globals mod_mono_globals; -extern mod_mono_globals globals; -#endif -#endif - -SWITCH_END_EXTERN_C - -#ifdef _MANAGED - using namespace System; using namespace System::Reflection; using namespace System::Runtime::InteropServices; @@ -134,4 +134,4 @@ hangupFunction hangupDelegate; }; -#endif \ No newline at end of file +#endif