aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-16 19:01:27 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-16 19:01:27 +0000
commita8df2e778110193494f9d6b9feba5e09a29d31cc (patch)
tree9822e8b36b850348a0546ed61ee5c67fe7bd5d98
parentcd313922d7068f98a27118baf785ab5eb9ae9fc3 (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.0@252768 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--utils/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/Makefile b/utils/Makefile
index 376f8aa1e..589a498bb 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -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