diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-26 20:21:04 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-26 20:21:04 +0000 |
| commit | e27acaa5de2958e98e05ddb82231231b73882945 (patch) | |
| tree | b97c44c064235dd00c5622fa3fafffee52c5c5f5 | |
| parent | e60bada432f9aa4af545117c3f2fa95ef5be21a0 (diff) | |
rename these files so as to avoid conflicts when users update their working copies and have unversioned files already in place
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@159571 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/Makefile | 8 | ||||
| -rw-r--r-- | channels/busy_tone.h (renamed from channels/busy.h) | 0 | ||||
| -rw-r--r-- | channels/chan_alsa.c | 4 | ||||
| -rw-r--r-- | channels/chan_oss.c | 4 | ||||
| -rw-r--r-- | channels/ring_tone.h (renamed from channels/ringtone.h) | 0 |
5 files changed, 8 insertions, 8 deletions
diff --git a/channels/Makefile b/channels/Makefile index e2cadfa13..8f067f6b0 100644 --- 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 index 6e5db8e47..6e5db8e47 100644 --- a/channels/busy.h +++ b/channels/busy_tone.h diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index eae5b6fa5..c0e77c5a3 100644 --- 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 a4f373ad9..ac62f2005 100644 --- 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 index 559c42a7b..559c42a7b 100644 --- a/channels/ringtone.h +++ b/channels/ring_tone.h |