[asterisk-commits] chan dahdi: wrap include file which is not present on BSD sy... (asterisk[master])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Oct 17 08:21:13 CDT 2017


Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/6804 )

Change subject: chan_dahdi: wrap include file which is not present on BSD systems in #ifdef
......................................................................

chan_dahdi: wrap include file which is not present on BSD systems in #ifdef

The sys/sysmacros.h include file does not exist in BSD systems and
is not required to build this module there.
Since an "#if defined(__NetBSD__) || defined(__FreeBSD__)" section
already exist I moved that include line inside it's #else branch.

ASTERISK-27343 #close

Change-Id: Ibfb64f4e9a0ce8b6eda7a7695cfe57916f175dc1
---
M channels/chan_dahdi.c
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 828753a..b20a0f3 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -56,11 +56,12 @@
 
 #if defined(__NetBSD__) || defined(__FreeBSD__)
 #include <pthread.h>
+#else
+#include <sys/sysmacros.h>
 #endif
 #include <signal.h>
 #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

-- 
To view, visit https://gerrit.asterisk.org/6804
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfb64f4e9a0ce8b6eda7a7695cfe57916f175dc1
Gerrit-Change-Number: 6804
Gerrit-PatchSet: 1
Gerrit-Owner: Guido Falsi <madpilot at freebsd.org>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20171017/de6fde42/attachment-0001.html>


More information about the asterisk-commits mailing list