Author: mikej Date: Wed Jun 13 16:49:45 2007 New Revision: 5348 Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp freeswitch/trunk/src/switch_loadable_module.c Log: fix windows build. Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Wed Jun 13 16:49:45 2007 @@ -368,50 +368,48 @@ /*.destroy */ switch_g726_destroy, }; -const switch_codec_interface_t g726_16k_codec_interface = { +static switch_codec_interface_t g726_16k_codec_interface = { /*.interface_name */ "G.726 16k", /*.implementations */ &g726_16k_implementation, }; -const switch_codec_interface_t g726_24k_codec_interface = { +static switch_codec_interface_t g726_24k_codec_interface = { /*.interface_name */ "G.726 24k", /*.implementations */ &g726_24k_implementation, /*.next */ &g726_16k_codec_interface }; -const switch_codec_interface_t g726_32k_codec_interface = { +static switch_codec_interface_t g726_32k_codec_interface = { /*.interface_name */ "G.726 32k", /*.implementations */ &g726_32k_implementation, /*.next */ &g726_24k_codec_interface }; -const switch_codec_interface_t g726_40k_codec_interface = { +static switch_codec_interface_t g726_40k_codec_interface = { /*.interface_name */ "G.726 40k", /*.implementations */ &g726_40k_implementation, /*.next */ &g726_32k_codec_interface }; - - -const switch_codec_interface_t aal2_g726_16k_codec_interface = { +static switch_codec_interface_t aal2_g726_16k_codec_interface = { /*.interface_name */ "G.726 16k (aal2)", /*.implementations */ &aal2_g726_16k_implementation, /*.next */ &g726_40k_codec_interface }; -const switch_codec_interface_t aal2_g726_24k_codec_interface = { +static switch_codec_interface_t aal2_g726_24k_codec_interface = { /*.interface_name */ "G.726 24k (aal2)", /*.implementations */ &aal2_g726_24k_implementation, /*.next */ &aal2_g726_16k_codec_interface }; -const switch_codec_interface_t aal2_g726_32k_codec_interface = { +static switch_codec_interface_t aal2_g726_32k_codec_interface = { /*.interface_name */ "G.726 32k (aal2)", /*.implementations */ &aal2_g726_32k_implementation, /*.next */ &aal2_g726_24k_codec_interface }; -const switch_codec_interface_t aal2_g726_40k_codec_interface = { +static switch_codec_interface_t aal2_g726_40k_codec_interface = { /*.interface_name */ "G.726 40k (aal2)", /*.implementations */ &aal2_g726_40k_implementation, /*.next */ &aal2_g726_32k_codec_interface Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Wed Jun 13 16:49:45 2007 @@ -108,7 +108,7 @@ /*.next */ &modcdr_queue_pause_api }; -static const switch_loadable_module_interface_t cdr_module_interface = { +static switch_loadable_module_interface_t cdr_module_interface = { /*.module_name */ modname, /*.endpoint_interface */ NULL, /*.timer_interface */ NULL, Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Wed Jun 13 16:49:45 2007 @@ -1348,7 +1348,7 @@ return mod; } -#define ALLOC_INTERFACE(_TYPE_) do { \ +#define ALLOC_INTERFACE(_TYPE_) for(;;) { \ switch_##_TYPE_##_interface_t *i, *ptr; \ i = switch_core_alloc(mod->pool, sizeof(switch_##_TYPE_##_interface_t)); \ assert(i != NULL); \ @@ -1359,7 +1359,7 @@ mod->_TYPE_##_interface = i; \ } \ \ - return i; } while(0) + return i; } SWITCH_DECLARE(void *) switch_loadable_module_create_interface(switch_loadable_module_interface_t *mod, switch_module_interface_name_t iname)