[svn-commits] russell: branch 1.6.0 r252768 - in /branches/1.6.0: ./ utils/Makefile

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Mar 16 14:01:27 2010
New Revision: 252768

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=252768
Log:
Merged revisions 252767 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r252767 | russell | 2010-03-16 14:01:04 -0500 (Tue, 16 Mar 2010) | 13 lines
  
  Merged revisions 252766 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r252766 | russell | 2010-03-16 14:00:43 -0500 (Tue, 16 Mar 2010) | 6 lines
    
    Don't treat warnings as errors for muted.
    
    muted supports OS X, but uses functions marked as deprecated in 10.6.  However,
    the functions are still supported, so just ignore the warnings for now and
    allow the build to proceed.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/utils/Makefile

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

Modified: branches/1.6.0/utils/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/utils/Makefile?view=diff&rev=252768&r1=252767&r2=252768
==============================================================================
--- branches/1.6.0/utils/Makefile (original)
+++ branches/1.6.0/utils/Makefile Tue Mar 16 14:01:27 2010
@@ -179,6 +179,7 @@
 
 muted: muted.o
 muted: LIBS+=$(AUDIO_LIBS)
+muted: _ASTCFLAGS:=$(filter-out -Werror,$(_ASTCFLAGS))
 
 ifneq ($(wildcard .*.d),)
    include .*.d