From: Russell Bryant Date: Tue, 16 Mar 2010 19:01:50 +0000 (+0000) Subject: Merged revisions 252767 via svnmerge from X-Git-Tag: 1.6.1.19-rc1~40 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=333a6e16abcccd97389273717e89a926203016ff;p=thirdparty%2Fasterisk.git 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. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@252769 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/utils/Makefile b/utils/Makefile index 78aef22640..80b0ea62da 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -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