aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-22 22:11:01 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-22 22:11:01 +0000
commit21ecfefe647461701504aeeccc9f795078094436 (patch)
tree7d7dc3b190e0c231e06caf43a57202700f8c7456 /include/asterisk
parent2d0c70e4ebb0f6d7e826065d6bb75e3e2513089e (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 'include/asterisk')
-rw-r--r--include/asterisk/options.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/options.h b/include/asterisk/options.h
index 57e1374fe..10c2126c2 100644
--- a/include/asterisk/options.h
+++ b/include/asterisk/options.h
@@ -124,8 +124,8 @@ extern char record_cache_dir[AST_CACHE_DIR_LEN];
extern char debug_filename[AST_FILENAME_MAX];
extern const char *dahdi_chan_name;
extern enum dahdi_chan_modes {
- ZAP_ONLY_MODE,
- DAHDI_PLUS_ZAP,
+ CHAN_ZAP_MODE,
+ CHAN_DAHDI_PLUS_ZAP_MODE,
} dahdi_chan_mode;
extern int ast_language_is_prefix;