diff options
| author | Sean Bright <sean@malleable.com> | 2008-08-07 15:16:48 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-08-07 15:16:48 +0000 |
| commit | 6305009cfc4a9ce54dc5ecbbaa9c10c51970b72c (patch) | |
| tree | 76635e989b9cee45e1c0376675b4149a86bfe53e /codecs | |
| parent | 83972093166956bb4e6f0991fc5f36b085415b82 (diff) | |
More merges from resolve-shadow warnings:
utils/
codecs/
and a change I missed from formats/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/Makefile | 2 | ||||
| -rw-r--r-- | codecs/codec_dahdi.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index e45d33e8f..620fb2f19 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -46,7 +46,7 @@ $(LIBLPC10): $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10) $(LIBILBC): - @$(MAKE) -C ilbc all ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)" + @$(MAKE) -C ilbc all ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations -Wshadow,$(ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)" $(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC) diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index 2de40f996..e87fa9ce8 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -362,12 +362,12 @@ static void drop_translator(int dst, int src) static void unregister_translators(void) { - struct translator *cur; + struct translator *current; AST_LIST_LOCK(&translators); - while ((cur = AST_LIST_REMOVE_HEAD(&translators, entry))) { - ast_unregister_translator(&cur->t); - ast_free(cur); + while ((current = AST_LIST_REMOVE_HEAD(&translators, entry))) { + ast_unregister_translator(¤t->t); + ast_free(current); } AST_LIST_UNLOCK(&translators); } |