aboutsummaryrefslogtreecommitdiffstats
path: root/channels/misdn
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-04-03 10:38:41 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-04-03 10:38:41 +0000
commit1605bd45a9b8af069fc169eeaab82c757cdf0131 (patch)
tree54566b4536dc727c361f1022ba309727ddc20981 /channels/misdn
parent788ae9dddc871dd56168ece91302536a9794cda9 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@59802 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn')
-rw-r--r--channels/misdn/chan_misdn_config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/misdn/chan_misdn_config.h b/channels/misdn/chan_misdn_config.h
index e21c59fdb..9305df500 100644
--- a/channels/misdn/chan_misdn_config.h
+++ b/channels/misdn/chan_misdn_config.h
@@ -68,7 +68,9 @@ enum misdn_cfg_elements {
/* general config items */
MISDN_GEN_FIRST,
+#ifndef MISDN_1_2
MISDN_GEN_MISDN_INIT, /* char[] */
+#endif
MISDN_GEN_DEBUG, /* int */
MISDN_GEN_TRACEFILE, /* char[] */
MISDN_GEN_BRIDGING, /* int (bool) */