rename these files so as to avoid conflicts when users update their working copies...

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@159571 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/Makefile b/channels/Makefile
index e2cadfa13127893950139e9db96e5d2c295a8379..8f067f6b02ee5d8f74e06bbdd181a1cfd2fca124 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -94,11 +94,11 @@ gentone: gentone.c
        $(CMD_PREFIX) $(HOST_CC) $(STATIC_BUILD) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $^ $(LIBS)
 gentone: LIBS+=-lm
 
-busy.h:
-       ./gentone busy 480 620
+busy_tone.h:
+       ./gentone busy_tone 480 620
 
-ringtone.h:
-       ./gentone ringtone 440 480
+ring_tone.h:
+       ./gentone ring_tone 440 480
 
 $(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): iax2-parser.o iax2-provision.o
 

diff --git a/channels/busy.h b/channels/busy_tone.h
similarity index 100%
rename from channels/busy.h
rename to channels/busy_tone.h

diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index eae5b6fa52052ee144183aa816ecb227c3db1d8b..c0e77c5a36c203164256c5a05535d55289badc52 100644 (file)
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -63,8 +63,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/abstract_jb.h"
 #include "asterisk/musiconhold.h"
 
-#include "busy.h"
-#include "ringtone.h"
+#include "busy_tone.h"
+#include "ring_tone.h"
 #include "ring10.h"
 #include "answer.h"
 

diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index a4f373ad93f7faf63288805b4a047df87ccf49be..ac62f2005a70f04040c334d8cfe156a0faaac241 100644 (file)
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -77,8 +77,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/musiconhold.h"
 
 /* ringtones we use */
-#include "busy.h"
-#include "ringtone.h"
+#include "busy_tone.h"
+#include "ring_tone.h"
 #include "ring10.h"
 #include "answer.h"
 

diff --git a/channels/ringtone.h b/channels/ring_tone.h
similarity index 100%
rename from channels/ringtone.h
rename to channels/ring_tone.h