kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-18 09:32:34 +00:00
Code Issues Projects Releases Wiki Activity

a little more cleanup

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9822 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-10-04 05:12:47 +00:00
parent 01a029de99
commit 76b7744a45
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mod/languages/mod_managed/freeswitch_managed.cpp
View File

@ -32,21 +32,6 @@
#include <switch.h> #include <switch.h>
#include <switch_cpp.h> #include <switch_cpp.h>
#ifdef _MANAGED
#define ATTACH_THREADS
#else
#include <glib.h>
#include <mono/metadata/threads.h>
#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" #include "freeswitch_managed.h"
ManagedSession::ManagedSession():CoreSession() ManagedSession::ManagedSession():CoreSession()

20
src/mod/languages/mod_managed/freeswitch_managed.h
View File

@ -26,12 +26,12 @@
* Michael Giagnocavo <mgg@packetrino.com> * Michael Giagnocavo <mgg@packetrino.com>
* Jeff Lenk <jlenk@frontiernet.net> - Modified class to support Dotnet * Jeff Lenk <jlenk@frontiernet.net> - Modified class to support Dotnet
* *
* freeswitch_mono.h -- Header for MonoSession and globals * freeswitch_managed.h -- Header for ManagedSession and globals
* *
*/ */
#ifndef FREESWITCH_MONO_H #ifndef FREESWITCH_MANAGED_H
#define FREESWITCH_MONO_H #define FREESWITCH_MANAGED_H
SWITCH_BEGIN_EXTERN_C SWITCH_BEGIN_EXTERN_C
@ -41,10 +41,13 @@ 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);
#ifndef _MANAGED #ifdef _MANAGED
#define ATTACH_THREADS
#else
#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/threads.h>
#ifndef SWIG #ifndef SWIG
struct mod_mono_globals { struct mod_mono_globals {
@ -63,6 +66,13 @@ struct mod_mono_globals {
typedef struct mod_mono_globals mod_mono_globals; typedef struct mod_mono_globals mod_mono_globals;
extern mod_mono_globals globals; extern mod_mono_globals globals;
#endif #endif
#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 #endif
SWITCH_END_EXTERN_C SWITCH_END_EXTERN_C