diff options
| author | Mark Michelson <mmichelson@digium.com> | 2008-07-28 16:00:19 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2008-07-28 16:00:19 +0000 |
| commit | 06d951f58588d6713a71d2aa689a07e2af70254e (patch) | |
| tree | f54c744da738790027a3a283aca0ca09dec29679 /main | |
| parent | 4c372e41a2658e7f3bf8f2928dc761c0b1a78f25 (diff) | |
merging the zap_and_dahdi_trunk branch up to trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 9ef8d6522..20dd36343 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -158,8 +158,6 @@ int option_maxfiles; /*!< Max number of open file handles (files, sockets) */ #if defined(HAVE_SYSINFO) long option_minmemfree; /*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */ #endif -char dahdi_chan_name[AST_CHANNEL_NAME] = "ZAP"; -int dahdi_chan_name_len = 3; /*! @} */ @@ -2786,11 +2784,6 @@ static void ast_readconfig(void) option_minmemfree = 0; } #endif - } else if (!strcasecmp(v->name, "dahdichanname")) { - if (!strcasecmp(v->value, "yes")) { - ast_copy_string(dahdi_chan_name, "DAHDI", sizeof(dahdi_chan_name)); - dahdi_chan_name_len = 5; - } } else if (!strcasecmp(v->name, "entityid")) { struct ast_eid tmp_eid; if (!ast_str_to_eid(&tmp_eid, v->value)) { |