kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "chan_unistim: NetBSD has an incompatible struct in_pktinfo."

Browse Source
This commit is contained in:
Jenkins2
2018-03-05 12:42:56 -06:00
committed by Gerrit Code Review
parent 0072f75650 aabbb49e33
commit 24c72ea286
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_unistim.c
View File

@@ -41,7 +41,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <signal.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 * 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 * which is not included by default by sys/socket.h - in_pktinfo is defined in
@@ -53,7 +53,7 @@
#ifdef HAVE_PKTINFO #ifdef HAVE_PKTINFO
#undef HAVE_PKTINFO #undef HAVE_PKTINFO
#endif #endif
#endif /* __CYGWIN__ */ #endif /* __CYGWIN__ || __NetBSD__ */
#include "asterisk/paths.h" /* ast_config_AST_LOG_DIR used in (too ?) many places */ #include "asterisk/paths.h" /* ast_config_AST_LOG_DIR used in (too ?) many places */
#include "asterisk/network.h" #include "asterisk/network.h"