From fcf027550c824bc49c55b79ff07abe14b328f368 Mon Sep 17 00:00:00 2001 From: Arnaldo M Pereira Date: Mon, 18 Oct 2010 15:37:28 -0200 Subject: [PATCH] removed macro FREETDM_EXPORTS from msvc ftmod_sangoma_isdn build, changed visibility on e other functions and added EX_DECLARE_DATA to ftmod_sangoma_isdn module definition. now building and loading on win32, but not working. --- .../ftmod_sangoma_isdn/ftmod_sangoma_isdn.2008.vcproj | 2 +- .../src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c | 2 +- .../src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2008.vcproj b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2008.vcproj index e5d6b74e36..e3930d8188 100644 --- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2008.vcproj +++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2008.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""C:\Program Files\libsng_isdn\include";"C:\Program Files\libsng_isdn\include\sng_isdn";../../include;"C:\Program Files\Sangoma\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FREETDM_EXPORTS;" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;" MinimalRebuild="true" ExceptionHandling="0" BasicRuntimeChecks="3" diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c index 0ed5902153..803e6371d7 100644 --- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c +++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c @@ -1010,7 +1010,7 @@ static FIO_IO_LOAD_FUNCTION(ftdm_sangoma_isdn_io_init) return FTDM_SUCCESS; } -ftdm_module_t ftdm_module = +EX_DECLARE_DATA ftdm_module_t ftdm_module = { "sangoma_isdn", /* char name[256]; */ ftdm_sangoma_isdn_io_init, /* fio_io_load_t */ diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h index 81121af6cd..7db753e420 100644 --- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h +++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h @@ -266,16 +266,16 @@ extern ftdm_sngisdn_data_t g_sngisdn_data; ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_span_t *span); /* Support functions */ -uint32_t get_unique_suInstId(uint8_t cc_id); +FT_DECLARE_INLINE(uint32_t) get_unique_suInstId(uint8_t cc_id); FT_DECLARE_INLINE(void) clear_call_data(sngisdn_chan_data_t *sngisdn_info); FT_DECLARE_INLINE(void) clear_call_glare_data(sngisdn_chan_data_t *sngisdn_info); void stack_hdr_init(Header *hdr); void stack_pst_init(Pst *pst); -ftdm_status_t get_ftdmchan_by_spInstId(uint8_t cc_id, uint32_t spInstId, sngisdn_chan_data_t **sngisdn_data); -ftdm_status_t get_ftdmchan_by_suInstId(uint8_t cc_id, uint32_t suInstId, sngisdn_chan_data_t **sngisdn_data); -ftdm_status_t sng_isdn_set_avail_rate(ftdm_span_t *ftdmspan, sngisdn_avail_t avail); +FT_DECLARE_INLINE(ftdm_status_t) get_ftdmchan_by_spInstId(uint8_t cc_id, uint32_t spInstId, sngisdn_chan_data_t **sngisdn_data); +FT_DECLARE_INLINE(ftdm_status_t) get_ftdmchan_by_suInstId(uint8_t cc_id, uint32_t suInstId, sngisdn_chan_data_t **sngisdn_data); +FT_DECLARE_INLINE(ftdm_status_t) sng_isdn_set_avail_rate(ftdm_span_t *ftdmspan, sngisdn_avail_t avail); /* Outbound Call Control functions */ void sngisdn_snd_setup(ftdm_channel_t *ftdmchan);