[asterisk-commits] tilghman: branch 1.6.0 r262337 - in /branches/1.6.0: ./ apps/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue May 11 12:25:11 2010
New Revision: 262337

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=262337
Log:
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)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile.rules
    branches/1.6.0/apps/app_voicemail.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile.rules
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/Makefile.rules?view=diff&rev=262337&r1=262336&r2=262337
==============================================================================
--- branches/1.6.0/Makefile.rules (original)
+++ branches/1.6.0/Makefile.rules Tue May 11 12:25:11 2010
@@ -37,9 +37,6 @@
 
 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

Modified: branches/1.6.0/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_voicemail.c?view=diff&rev=262337&r1=262336&r2=262337
==============================================================================
--- branches/1.6.0/apps/app_voicemail.c (original)
+++ branches/1.6.0/apps/app_voicemail.c Tue May 11 12:25:11 2010
@@ -7457,6 +7457,7 @@
 
 	/* 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 */