diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2010-08-11 20:38:57 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2010-08-11 20:38:57 +0000 |
| commit | b8a71201dc57d66933bfe66e506b2b7e2feac06e (patch) | |
| tree | 091a95390ade3aa59d97afe9f7a65920fbeb81b3 /channels/sig_analog.h | |
| parent | 3960c2c8ea0fbf702faf6494ff0f5ae47ccc9026 (diff) | |
Merged revisions 281870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r281870 | rmudgett | 2010-08-11 15:30:29 -0500 (Wed, 11 Aug 2010) | 4 lines
Fix a call to analog_set_pulsedial() not setting 0 or 1 only.
* Also a couple minor tweaks.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@281871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_analog.h')
| -rw-r--r-- | channels/sig_analog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/sig_analog.h b/channels/sig_analog.h index ff62ed52d..d88e622e7 100644 --- a/channels/sig_analog.h +++ b/channels/sig_analog.h @@ -271,6 +271,7 @@ struct analog_pvt { unsigned int transfer:1; unsigned int transfertobusy:1; /*!< allow flash-transfers to busy channels */ unsigned int use_callerid:1; /*!< Whether or not to use caller id on this channel */ + unsigned int callwaitingcallerid:1; const struct ast_channel_tech *chan_tech; /*! * \brief TRUE if distinctive rings are to be detected. @@ -287,7 +288,6 @@ struct analog_pvt { int polarityonanswerdelay; int stripmsd; enum analog_cid_start cid_start; - int callwaitingcallerid; char mohsuggest[MAX_MUSICCLASS]; char cid_num[AST_MAX_EXTENSION]; char cid_name[AST_MAX_EXTENSION]; |