summaryrefslogtreecommitdiff
path: root/net/asterisk13/files/patch-channels-chan_dahdi.c
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2017-10-30 22:58:18 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2017-10-30 22:58:18 +0000
commita6d6400dc9d33f3beec819f80a572c69ca1794cc (patch)
treec9ee8a72416bc541c9f7c51c5cd9e5df9033b23a /net/asterisk13/files/patch-channels-chan_dahdi.c
parentDo not mix py3kplist with %%PYTHON_PYOEXTENSION%% (diff)
Update asterisk13 to 13.18.0
Diffstat (limited to 'net/asterisk13/files/patch-channels-chan_dahdi.c')
-rw-r--r--net/asterisk13/files/patch-channels-chan_dahdi.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/net/asterisk13/files/patch-channels-chan_dahdi.c b/net/asterisk13/files/patch-channels-chan_dahdi.c
index 0d8b1feadb79..94b4d36bfd18 100644
--- a/net/asterisk13/files/patch-channels-chan_dahdi.c
+++ b/net/asterisk13/files/patch-channels-chan_dahdi.c
@@ -1,6 +1,18 @@
---- channels/chan_dahdi.c.orig 2015-07-24 22:20:17 UTC
+--- channels/chan_dahdi.c.orig 2017-10-13 17:46:56 UTC
+++ channels/chan_dahdi.c
-@@ -4598,6 +4598,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p
+@@ -61,10 +61,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ #include <signal.h>
+ #else
+ #include <sys/signal.h>
++#include <sys/sysmacros.h>
+ #endif
+ #include <sys/stat.h>
+ #include <math.h>
+-#include <sys/sysmacros.h>
+
+ #include "sig_analog.h"
+ /* Analog signaling is currently still present in chan_dahdi for use with
+@@ -4666,6 +4666,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
return;
}
if (p->echocancel.head.tap_length) {
@@ -9,7 +21,7 @@
#if defined(HAVE_PRI) || defined(HAVE_SS7)
switch (p->sig) {
#if defined(HAVE_PRI)
-@@ -4628,7 +4630,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p
+@@ -4696,7 +4698,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
break;
}
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
@@ -20,7 +32,7 @@
if (res) {
ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
} else {
-@@ -4662,8 +4666,9 @@ void dahdi_ec_disable(struct dahdi_pvt *
+@@ -4730,8 +4734,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };