Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
certified/13.21
Jenkins2 7 years ago committed by Gerrit Code Review
parent 83c2d6a89f 7b5e0960ef
commit 451fec3044
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
channels/chan_unistim.c
Unescape View File

@ -43,7 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#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
@ -55,7 +55,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#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"

Write Preview
Loading…
Cancel
Save