diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-22 22:11:01 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-22 22:11:01 +0000 |
| commit | 21ecfefe647461701504aeeccc9f795078094436 (patch) | |
| tree | 7d7dc3b190e0c231e06caf43a57202700f8c7456 /main/asterisk.c | |
| parent | 2d0c70e4ebb0f6d7e826065d6bb75e3e2513089e (diff) | |
fix up namespace pollution for dahdi_chan_mode enum
correct registration of AMI actions in chan_dahdi; in zap-only mode, only register the Zap flavors of the actions (and use Zap prefixes for headers and acks), but in dahdi+zap mode, register both Zap and DAHDI flavors of actions
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@132787 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 36a65c91a..4bfa45036 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -174,10 +174,10 @@ char record_cache_dir[AST_CACHE_DIR_LEN] = AST_TMP_DIR; char debug_filename[AST_FILENAME_MAX] = ""; #ifdef HAVE_ZAPTEL char _dahdi_chan_name[AST_CHANNEL_NAME] = "Zap"; -enum dahdi_chan_modes dahdi_chan_mode = ZAP_ONLY_MODE; +enum dahdi_chan_modes dahdi_chan_mode = CHAN_ZAP_MODE; #else char _dahdi_chan_name[AST_CHANNEL_NAME] = "DAHDI"; -enum dahdi_chan_modes dahdi_chan_mode = DAHDI_PLUS_ZAP; +enum dahdi_chan_modes dahdi_chan_mode = CHAN_DAHDI_PLUS_ZAP_MODE; #endif const char *dahdi_chan_name; @@ -2593,12 +2593,12 @@ static void ast_readconfig(void) #ifdef HAVE_ZAPTEL if (ast_true(v->value)) { strcpy(_dahdi_chan_name, "DAHDI"); - dahdi_chan_mode = DAHDI_PLUS_ZAP; + dahdi_chan_mode = CHAN_DAHDI_PLUS_ZAP_MODE; } #else if (ast_false(v->value)) { strcpy(_dahdi_chan_name, "Zap"); - dahdi_chan_mode = ZAP_ONLY_MODE; + dahdi_chan_mode = CHAN_ZAP_MODE; } #endif } |