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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@262339 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile.rules b/Makefile.rules
index 9a97373a55de966d44919ae81676c1eca361861a..89c5fc113782b8fd1eabbd038bbd9f55905070db 100644 (file)
--- 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 4f41f09ba38d649a25564c23759807a184cbadf8..fcc8dd38961cc911fcb92ea110be9a9364e66194 100644 (file)
--- 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 */