From 0a27d8bfe5fa36d8cb600b5b520f9b5c7fbf0ed6 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 21 Aug 2006 02:11:39 +0000 Subject: merge new_loader_completion branch, including (at least): - restructured build tree and makefiles to eliminate recursion problems - support for embedded modules - support for static builds - simpler cross-compilation support - simpler module/loader interface (no exported symbols) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- formats/format_wav_gsm.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'formats/format_wav_gsm.c') diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index 556f70b82..fea08952e 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -555,27 +555,16 @@ static const struct ast_format wav49_f = { .close = wav_close, .buf_size = 2*GSM_FRAME_SIZE + AST_FRIENDLY_OFFSET, .desc_size = sizeof(struct wavg_desc), - .module = &mod_data, /* XXX */ }; -static int load_module(void *mod) +static int load_module(void) { return ast_format_register(&wav49_f); } -static int unload_module(void *mod) +static int unload_module(void) { return ast_format_unregister(wav49_f.name); } -static const char *description(void) -{ - return "Microsoft WAV format (Proprietary GSM)"; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD1; +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Microsoft WAV format (Proprietary GSM)"); -- cgit v1.2.3