aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-16 19:02:10 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-16 19:02:10 +0000
commit730a6dc0e8c2a66140b22fbc396298229b1f28ef (patch)
tree8f8fca04bfd86c218720b29988c16ac1b2b2eb36
parentaf2be90dbc0742d9c19afa0a7d95ac28c2c48477 (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.2@252770 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 ed7eebe56..cbf175958 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -200,6 +200,7 @@ streamplayer: streamplayer.o
muted: muted.o
muted: LIBS+=$(AUDIO_LIBS)
+muted: _ASTCFLAGS:=$(filter-out -Werror,$(_ASTCFLAGS))
ifneq ($(wildcard .*.d),)
include .*.d