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

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

utils/Makefile

index 78aef2264095f9c77b076aadcf5311ee46fb3c5f..80b0ea62da0b639a2db769d4f2d0fbc4623b77e6 100644 (file)
@@ -182,6 +182,7 @@ streamplayer: streamplayer.o
 
 muted: muted.o
 muted: LIBS+=$(AUDIO_LIBS)
+muted: _ASTCFLAGS:=$(filter-out -Werror,$(_ASTCFLAGS))
 
 ifneq ($(wildcard .*.d),)
    include .*.d