diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-05-08 21:00:16 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-05-08 21:00:16 +0000 |
| commit | 962d53732a6cf46a0791131d71d24ce06aad1688 (patch) | |
| tree | 9273d299a8fe84b33fe0133b7e407df82b489e47 /indications.c | |
| parent | c85b4a1674ead29de82664baa84d8ebe137ad5fe (diff) | |
make sure that the MOD_SUBDIR_CFLAGS and OTHER_SUBDIR_FLAGS come before
ASTCFLAGS so that -Iinclude comes before any system include path
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25686 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'indications.c')
| -rw-r--r-- | indications.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indications.c b/indications.c index 9b632de98..996e43e86 100644 --- a/indications.c +++ b/indications.c @@ -412,12 +412,13 @@ struct tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, co struct tone_zone_sound *ts; /* we need some tonezone, pick the first */ - if (zone == NULL && current_tonezone) - zone = current_tonezone; /* default country? */ - if (zone == NULL && tone_zones) - zone = tone_zones; /* any country? */ - if (zone == NULL) - return 0; /* not a single country insight */ + if (!zone) { + if (current_tonezone) + return current_tonezone; /* default country? */ + if (tone_zones) + return tone_zones; /* any country? */ + return 0; /* not a single country insight */ + } if (ast_mutex_lock(&tzlock)) { ast_log(LOG_WARNING, "Unable to lock tone_zones list\n"); |