| From 19c37f8d02cfe3a0490981cd9c3370fe544b76ac Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Cl=C3=A9ment=20Vasseur?= <clement.vasseur@gmail.com> |
| Date: Thu, 30 Nov 2017 16:05:49 +0000 |
| Subject: [PATCH] Fix build with musl libc |
| |
| Signed-off-by: Baruch Siach <baruch@tkos.co.il> |
| --- |
| Upstream status: commit 19c37f8d02cf |
| |
| multicat.c | 7 ++----- |
| util.h | 3 ++- |
| 2 files changed, 4 insertions(+), 6 deletions(-) |
| |
| diff --git a/multicat.c b/multicat.c |
| index eeab930fc1db..e8b6874d6f4c 100644 |
| --- a/multicat.c |
| +++ b/multicat.c |
| @@ -1,7 +1,7 @@ |
| /***************************************************************************** |
| * multicat.c: netcat-equivalent for multicast |
| ***************************************************************************** |
| - * Copyright (C) 2009, 2011-2012, 2015-2016 VideoLAN |
| + * Copyright (C) 2009, 2011-2012, 2015-2017 VideoLAN |
| * $Id$ |
| * |
| * Authors: Christophe Massiot <massiot@via.ecp.fr> |
| @@ -43,10 +43,7 @@ |
| #include <poll.h> |
| #include <sys/ioctl.h> |
| #include <syslog.h> |
| - |
| -#ifdef __FreeBSD__ |
| -# include <sys/uio.h> |
| -#endif |
| +#include <sys/uio.h> |
| |
| #ifdef SIOCGSTAMPNS |
| # define HAVE_TIMESTAMPS |
| diff --git a/util.h b/util.h |
| index 1959a2edb155..724e7d843d22 100644 |
| --- a/util.h |
| +++ b/util.h |
| @@ -1,7 +1,7 @@ |
| /***************************************************************************** |
| * util.h: Utils for the multicat suite |
| ***************************************************************************** |
| - * Copyright (C) 2009, 2011, 2014-2016 VideoLAN |
| + * Copyright (C) 2009, 2011, 2014-2017 VideoLAN |
| * $Id$ |
| * |
| * Authors: Christophe Massiot <massiot@via.ecp.fr> |
| @@ -23,6 +23,7 @@ |
| |
| #include <netinet/udp.h> |
| #include <netinet/ip.h> |
| +#include <sys/types.h> |
| |
| #if defined(__APPLE__) || defined(__FreeBSD__) |
| #define POLLRDHUP 0 |
| -- |
| 2.17.0 |
| |