aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-16 19:01:50 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-16 19:01:50 +0000
commit0fefd7e5ce70be57d3e45cb91e176f64421ddc23 (patch)
tree1686d4579c237b3e59cf44ce9d483cd9967f257a /utils
parent6bb35e43366d9ad81f64086dff0ec96b4a22b607 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@252769 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/Makefile b/utils/Makefile
index 78aef2264..80b0ea62d 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