Skip to content

Commit 06a3f22

Browse files
committed
patches: Update rtoutpulsing channels patch.
Fix compilation failure following asterisk/asterisk@fe7be89 Because in different releases, the patch context is slightly different, we just remove the offending context, rather than modify it.
1 parent c3d74a9 commit 06a3f22

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

patches/ast_rtoutpulsing2.diff

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@ diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
22
index 3baabb0872..81feb3ad0b 100644
33
--- a/channels/chan_dahdi.c
44
+++ b/channels/chan_dahdi.c
5-
@@ -1050,6 +1050,7 @@ static struct dahdi_chan_conf dahdi_chan_conf_default(void)
5+
@@ -1050,3 +1050,4 @@ static struct dahdi_chan_conf dahdi_chan_conf_default(void)
66
.mohsuggest = "",
77
.parkinglot = "",
88
.transfertobusy = 1,
99
+ .realtimepulsing = 0,
10-
.dialmode = 0,
11-
12-
.ani_info_digits = 2,
1310
@@ -12958,6 +12959,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
1411
tmp->immediate = conf->chan.immediate;
1512
tmp->immediatering = conf->chan.immediatering;

patches/ast_rtoutpulsing_channels.diff

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,7 @@ index ae909ebba6..878794ba81 100644
129129
/*! \brief -1 = unknown, 0 = no messages, 1 = new messages available */
130130
int msgstate;
131131

132-
@@ -302,6 +311,7 @@ struct analog_pvt {
133-
unsigned int callwaitingdeluxe:1; /*!< TRUE if Call Waiting Deluxe options are available */
134-
unsigned int permhidecallerid:1; /*!< Whether to hide our outgoing caller ID or not */
132+
@@ -302,2 +311,3 @@ struct analog_pvt {
135133
unsigned int pulse:1;
136134
+ unsigned int realtimepulsing:1; /*!< TRUE if realtimepulsing is enabled */
137135
unsigned int threewaycalling:1;
138-
unsigned int threewaysilenthold:1; /*!< Whether to time out a three-way dial tone to silence */
139-
unsigned int transfer:1;

0 commit comments

Comments
 (0)