Fix issue #17302 a slightly different way (mad props to Qwell)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@262321 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile.rules b/Makefile.rules
index d38f95a9d2729c07f9f61c93298627e0e7f1c7a6..8ffa19debf8c1d42a06b5f1ec3b3a358317fc692 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 701689f2b2440e5cfad9f42e61496e6730dbe642..5be892d846c4cc37ec28c7092e7b7aad95e4d9be 100644 (file)
--- 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 */