diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-11 17:23:51 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-11 17:23:51 +0000 |
| commit | b4dd78e0b63109568467413b054609031199dcfa (patch) | |
| tree | 419bda2961ae7201ce12b30b8f26ca7bfef9ca77 | |
| parent | b2f08335207810937d79f96d1e9cfd0fb16482af (diff) | |
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/trunk@262330 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile.rules | 3 | ||||
| -rw-r--r-- | apps/app_voicemail.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.rules b/Makefile.rules index 7ae427844..f76d84b15 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 a311b6e8d..7d29da74d 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 */ |