diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-03-05 12:42:56 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-03-05 12:42:56 -0600 |
| commit | 24c72ea28667fe70a36f08853fc92785d51f1f2c (patch) | |
| tree | 9aafb7b31d282dca18149d5e451229d99de5b760 /channels | |
| parent | 0072f75650745cf40185324ac470cff7a68a6ab4 (diff) | |
| parent | aabbb49e33ac05d5280ef9b409e64f79342bcb8f (diff) | |
Merge "chan_unistim: NetBSD has an incompatible struct in_pktinfo."
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_unistim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 9d4c453fc..28d84eeea 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" |