From c84e7f83c8848edfc37bca93f6fd6151131255ee Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Tue, 11 May 2010 17:23:51 +0000 Subject: [PATCH] Merged revisions 262321 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r262321 | tilghman | 2010-05-11 12:22:07 -0500 (Tue, 11 May 2010) | 2 lines Fix issue #17302 a slightly different way (mad props to Qwell) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@262330 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile.rules | 3 --- apps/app_voicemail.c | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index 7ae4278444..f76d84b15b 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -37,9 +37,6 @@ endif OPTIMIZE?=-O6 ifneq ($(findstring darwin,$(OSARCH)),) - ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.4) - OPTIMIZE+=-fno-inline - endif ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6) # Snow Leopard has an issue with this optimization flag on large files (like chan_sip) OPTIMIZE+=-fno-inline-functions diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index a311b6e8d8..7d29da74d3 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -8635,6 +8635,7 @@ static int vm_intro(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm /* Play voicemail intro - syntax is different for different languages */ if (0) { + return 0; } else if (!strncasecmp(chan->language, "cs", 2)) { /* CZECH syntax */ return vm_intro_cs(chan, vms); } else if (!strncasecmp(chan->language, "cz", 2)) { /* deprecated CZECH syntax */