]> 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:27 +0000 (19:01 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 16 Mar 2010 19:01:27 +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.0@252768 65c4cc65-6c06-0410-ace0-fbb531ad65f3

utils/Makefile

index 376f8aa1e829c9b73283705fa7a164aaa5fafdb8..589a498bb824d217b920860abe674ea8d4c3f02b 100644 (file)
@@ -179,6 +179,7 @@ streamplayer: streamplayer.o
 
 muted: muted.o
 muted: LIBS+=$(AUDIO_LIBS)
+muted: _ASTCFLAGS:=$(filter-out -Werror,$(_ASTCFLAGS))
 
 ifneq ($(wildcard .*.d),)
    include .*.d