diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-12-25 06:38:09 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-12-25 06:38:09 +0000 |
commit | 09f75aa6dcb4aaaeee07a9e3d2823d10c17b2e0e (patch) | |
tree | 5b90e73ac89248eea33d1422f7da41214e0e3703 /main/channel.c | |
parent | b93f1f3e3779001d2affc483c7a357c678d9211b (diff) |
rename the structs struct tone_zone_sound and struct tone_zone
defined in indications.h to ind_tone_zone_sound and ind_tone_zone,
to avoid conflicts with the structs with the same names
defined in tonezone.h
Hope i haven't missed any instance.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
-rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 3b06b266a..cb31be81a 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2301,7 +2301,7 @@ int ast_indicate_data(struct ast_channel *chan, int condition, const void *data, if (condition < 0) ast_playtones_stop(chan); else { - const struct tone_zone_sound *ts = NULL; + const struct ind_tone_zone_sound *ts = NULL; switch (condition) { case AST_CONTROL_RINGING: ts = ast_get_indication_tone(chan->zone, "ring"); |