aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-11 17:22:07 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-11 17:22:07 +0000
commite3b7e2eea498412d94d263260ef351ec428052ee (patch)
treed0a77bebbf33d325e1146b3d36666fd73fd3ed4f
parentdc15ece7220ad82fa0208343913108e5ab12e45b (diff)
Fix issue #17302 a slightly different way (mad props to Qwell)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@262321 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 d38f95a9d..8ffa19deb 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 701689f2b..5be892d84 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6886,6 +6886,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 */