[Asterisk-code-review] chan unistim: NetBSD has an incompatible struct in pktinfo. (asterisk[master])

Jenkins2 asteriskteam at digium.com
Mon Mar 5 12:42:56 CST 2018


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

Change subject: chan_unistim: NetBSD has an incompatible struct in_pktinfo.
......................................................................

chan_unistim: NetBSD has an incompatible struct in_pktinfo.

ASTERISK-27714
Reported by: John Nemeth

Change-Id: I1b84a89315a5f61222123d21bf35c59224da8990
---
M channels/chan_unistim.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Corey Farrell: Looks good to me, but someone else must approve
  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_unistim.c b/channels/chan_unistim.c
index 9d4c453..28d84ee 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -41,7 +41,7 @@
 #include <sys/stat.h>
 #include <signal.h>
 
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(__NetBSD__)
 /*
  * cygwin headers are partly inconsistent. struct iovec is defined in sys/uio.h
  * which is not included by default by sys/socket.h - in_pktinfo is defined in
@@ -53,7 +53,7 @@
 #ifdef HAVE_PKTINFO
 #undef HAVE_PKTINFO
 #endif
-#endif /* __CYGWIN__ */
+#endif /* __CYGWIN__ || __NetBSD__ */
 
 #include "asterisk/paths.h"	/* ast_config_AST_LOG_DIR used in (too ?) many places */
 #include "asterisk/network.h"

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

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b84a89315a5f61222123d21bf35c59224da8990
Gerrit-Change-Number: 8415
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
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-code-review/attachments/20180305/63c781f4/attachment.html>


More information about the asterisk-code-review mailing list