diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-07 15:16:48 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-07 15:16:48 +0000 |
| commit | f21f6ae82a790d6e0ad53bd7eef20842bd443218 (patch) | |
| tree | 76635e989b9cee45e1c0376675b4149a86bfe53e /codecs | |
| parent | 777979c9d9280bfd9526345a1b326ad46b1b45fb (diff) | |
More merges from resolve-shadow warnings:
utils/
codecs/
and a change I missed from formats/
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@136408 f38db490-d61c-443f-a65b-d21fe96a405b
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); } |