diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:13:34 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:13:34 +0000 |
| commit | 8c653dc5c125614f66b4d353e2187e3e0c4ea215 (patch) | |
| tree | 88e7e23f664c1b884a8f699fadd6173b156ed596 /main/asterisk.c | |
| parent | fbb76c4a14728417f6f6a538d7251c54116b6522 (diff) | |
Merged revisions 134050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r134050 | mmichelson | 2008-07-28 11:00:19 -0500 (Mon, 28 Jul 2008) | 3 lines
merging the zap_and_dahdi_trunk branch up to trunk
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134052 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 6a02ea8b3..97a3e6cbe 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -162,8 +162,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; /*! @} */ |