]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 252766 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 16 Mar 2010 19:01:04 +0000 (19:01 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 16 Mar 2010 19:01:04 +0000 (19:01 +0000)
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.
........

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

utils/Makefile

index 8c8ae5d0d90488d5d9baed766c77b297117c144c..2f707482028af5bbd4e8873295e75d009dee8d8b 100644 (file)
@@ -200,6 +200,7 @@ streamplayer: streamplayer.o
 
 muted: muted.o
 muted: LIBS+=$(AUDIO_LIBS)
+muted: _ASTCFLAGS:=$(filter-out -Werror,$(_ASTCFLAGS))
 
 ifneq ($(wildcard .*.d),)
    include .*.d