aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-11 17:25:19 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-11 17:25:19 +0000
commite6b0396b5f64bbad31c0d7408a55a2706a8fd797 (patch)
tree2f99891a169dbfd76c1cc0c8017f7dff61d13505
parent7c032b1ed7b0b15fdd2ceef77ee956f286b1ff63 (diff)
Merged revisions 262330 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r262330 | tilghman | 2010-05-11 12:23:51 -0500 (Tue, 11 May 2010) | 9 lines 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: http://svn.digium.com/svn/asterisk/branches/1.6.1@262339 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile.rules3
-rw-r--r--apps/app_voicemail.c1
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 9a97373a5..89c5fc113 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 4f41f09ba..fcc8dd389 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -8259,6 +8259,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 */