<sys/socket.h> already exposes struct iovec, no need to include <sys/uio.h>.
Remove now useless (parts of) patches.
This commit is contained in:
naddy
parent
4cd91c97ef
commit
6dfe1e0668
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-ext_sockets_conversions_c,v 1.1.1.1 2013/08/07 16:46:56 robert Exp $
|
||||
--- ext/sockets/conversions.c.orig.port Sun Jul 28 11:33:13 2013
|
||||
+++ ext/sockets/conversions.c Sun Jul 28 11:34:16 2013
|
||||
@@ -16,6 +16,9 @@
|
||||
# include <sys/un.h>
|
||||
# include <sys/ioctl.h>
|
||||
# include <net/if.h>
|
||||
+# if defined(__OpenBSD__)
|
||||
+# include <sys/uio.h>
|
||||
+# endif
|
||||
#else
|
||||
# include <win32/php_stdint.h>
|
||||
#endif
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-ext_sockets_conversions_c,v 1.1 2014/11/15 13:43:01 robert Exp $
|
||||
--- ext/sockets/conversions.c.orig.port Sun Jul 28 11:33:13 2013
|
||||
+++ ext/sockets/conversions.c Sun Jul 28 11:34:16 2013
|
||||
@@ -16,6 +16,9 @@
|
||||
# include <sys/un.h>
|
||||
# include <sys/ioctl.h>
|
||||
# include <net/if.h>
|
||||
+# if defined(__OpenBSD__)
|
||||
+# include <sys/uio.h>
|
||||
+# endif
|
||||
#else
|
||||
# include <win32/php_stdint.h>
|
||||
#endif
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-gst_dccp_gstdccp_c,v 1.2 2010/06/02 16:56:46 ajacoutot Exp $
|
||||
--- gst/dccp/gstdccp.c.orig Fri May 14 02:48:27 2010
|
||||
+++ gst/dccp/gstdccp.c Wed Jun 2 14:32:58 2010
|
||||
@@ -27,6 +27,11 @@
|
||||
#include <sys/filio.h>
|
||||
#endif
|
||||
|
||||
+// iovec
|
||||
+#ifdef __OpenBSD__
|
||||
+#include <sys/uio.h>
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* Resolves host to IP address
|
||||
* @param element - the element
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-gst_udp_gstmultiudpsink_c,v 1.2 2012/02/21 08:46:08 ajacoutot Exp $
|
||||
--- gst/udp/gstmultiudpsink.c.orig Thu Feb 16 00:48:07 2012
|
||||
+++ gst/udp/gstmultiudpsink.c Tue Feb 21 09:16:15 2012
|
||||
@@ -43,6 +43,11 @@
|
||||
|
||||
#include "gst/glib-compat-private.h"
|
||||
|
||||
+// iovec
|
||||
+#ifdef __OpenBSD__
|
||||
+#include <sys/uio.h>
|
||||
+#endif
|
||||
+
|
||||
GST_DEBUG_CATEGORY_STATIC (multiudpsink_debug);
|
||||
#define GST_CAT_DEFAULT (multiudpsink_debug)
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-gst_dccp_gstdccp_c,v 1.1.1.1 2012/09/06 13:02:41 ajacoutot Exp $
|
||||
--- gst/dccp/gstdccp.c.orig Fri May 14 02:48:27 2010
|
||||
+++ gst/dccp/gstdccp.c Wed Jun 2 14:32:58 2010
|
||||
@@ -27,6 +27,11 @@
|
||||
#include <sys/filio.h>
|
||||
#endif
|
||||
|
||||
+// iovec
|
||||
+#ifdef __OpenBSD__
|
||||
+#include <sys/uio.h>
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* Resolves host to IP address
|
||||
* @param element - the element
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-ProxyChannel_cxx,v 1.3 2014/01/03 06:21:04 ajacoutot Exp $
|
||||
|
||||
http://openh323gk.cvs.sourceforge.net/viewvc/openh323gk/openh323gk/ProxyChannel.cxx?r1=1.877&r2=1.878
|
||||
|
||||
--- ProxyChannel.cxx.orig Thu Jan 2 11:21:12 2014
|
||||
+++ ProxyChannel.cxx Fri Jan 3 07:01:23 2014
|
||||
@@ -59,6 +59,10 @@
|
||||
#include "h235/h235crypto.h"
|
||||
#endif
|
||||
|
||||
+#ifdef P_OPENBSD
|
||||
+#include <sys/uio.h>
|
||||
+#endif
|
||||
+
|
||||
#ifdef _WIN32
|
||||
#include <mswsock.h>
|
||||
#endif
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-src_liboping_c,v 1.1.1.1 2014/12/01 08:18:45 landry Exp $
|
||||
needed for struct iovec
|
||||
--- src/liboping.c.orig Tue Oct 28 11:41:21 2014
|
||||
+++ src/liboping.c Tue Oct 28 11:41:30 2014
|
||||
@@ -67,6 +67,7 @@
|
||||
|
||||
#if HAVE_SYS_SOCKET_H
|
||||
# include <sys/socket.h>
|
||||
+# include <sys/uio.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_NETDB_H
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-src_isis_stream_c,v 1.1 2014/03/22 23:05:43 sthen Exp $
|
||||
--- src/isis/stream.c.orig Sun Mar 16 01:44:20 2014
|
||||
+++ src/isis/stream.c Sun Mar 16 01:45:00 2014
|
||||
@@ -21,6 +21,7 @@
|
||||
*/
|
||||
|
||||
#define __STREAM_C
|
||||
+#include <sys/uio.h>
|
||||
|
||||
#include "pmacct.h"
|
||||
#include "isis.h"
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_dep_constants_dep_h,v 1.1.1.1 2009/01/20 19:05:23 naddy Exp $
|
||||
$OpenBSD: patch-src_dep_constants_dep_h,v 1.2 2015/01/19 20:44:15 naddy Exp $
|
||||
--- src/dep/constants_dep.h.orig Wed Mar 28 00:09:06 2007
|
||||
+++ src/dep/constants_dep.h Sun Oct 26 16:14:54 2008
|
||||
+++ src/dep/constants_dep.h Mon Jan 19 21:32:19 2015
|
||||
@@ -5,7 +5,8 @@
|
||||
|
||||
/* platform dependent */
|
||||
@ -20,7 +20,7 @@ $OpenBSD: patch-src_dep_constants_dep_h,v 1.1.1.1 2009/01/20 19:05:23 naddy Exp
|
||||
# include <sys/types.h>
|
||||
# include <sys/socket.h>
|
||||
# include <netinet/in.h>
|
||||
@@ -37,14 +38,21 @@
|
||||
@@ -37,14 +38,20 @@
|
||||
# if defined(__FreeBSD__)
|
||||
# include <net/ethernet.h>
|
||||
# include <sys/uio.h>
|
||||
@ -31,7 +31,6 @@ $OpenBSD: patch-src_dep_constants_dep_h,v 1.1.1.1 2009/01/20 19:05:23 naddy Exp
|
||||
# endif
|
||||
+# if defined(__OpenBSD__)
|
||||
+# include <netinet/if_ether.h>
|
||||
+# include <sys/uio.h>
|
||||
+# endif
|
||||
# include <ifaddrs.h>
|
||||
# define IFACE_NAME_LENGTH IF_NAMESIZE
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-spectool_net_client_h,v 1.3 2012/08/05 20:28:51 naddy Exp $
|
||||
--- spectool_net_client.h.orig Sun Aug 5 21:38:07 2012
|
||||
+++ spectool_net_client.h Sun Aug 5 21:38:22 2012
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <sys/time.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/uio.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h>
|
||||
#include <unistd.h>
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_osdep_openbsd_c,v 1.2 2014/07/01 12:15:10 sthen Exp $
|
||||
--- src/osdep/openbsd.c.orig Tue Feb 26 11:12:19 2008
|
||||
+++ src/osdep/openbsd.c Tue Jul 1 05:37:42 2014
|
||||
@@ -19,26 +19,26 @@
|
||||
$OpenBSD: patch-src_osdep_openbsd_c,v 1.3 2015/01/19 20:44:15 naddy Exp $
|
||||
--- src/osdep/openbsd.c.orig Tue Feb 26 19:12:19 2008
|
||||
+++ src/osdep/openbsd.c Mon Jan 19 21:39:05 2015
|
||||
@@ -19,26 +19,25 @@
|
||||
*/
|
||||
#include <sys/types.h>
|
||||
#include <sys/endian.h>
|
||||
@ -13,7 +13,6 @@ $OpenBSD: patch-src_osdep_openbsd_c,v 1.2 2014/07/01 12:15:10 sthen Exp $
|
||||
#include <sys/socket.h>
|
||||
+#include <sys/timeout.h>
|
||||
+#include <sys/ioctl.h>
|
||||
+#include <sys/uio.h>
|
||||
+#include <net/bpf.h>
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
@ -36,7 +35,7 @@ $OpenBSD: patch-src_osdep_openbsd_c,v 1.2 2014/07/01 12:15:10 sthen Exp $
|
||||
#include <assert.h>
|
||||
#include <ifaddrs.h>
|
||||
|
||||
@@ -273,7 +273,7 @@ static int obsd_write(struct wif *wi, unsigned char *h
|
||||
@@ -273,7 +272,7 @@ static int obsd_write(struct wif *wi, unsigned char *h
|
||||
if (rc == -1)
|
||||
return rc;
|
||||
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-networkutils_recvfromex_cpp,v 1.1.1.1 2013/06/18 14:28:37 sthen Exp $
|
||||
--- networkutils/recvfromex.cpp.orig Fri Mar 15 10:49:19 2013
|
||||
+++ networkutils/recvfromex.cpp Sun Jun 16 22:27:52 2013
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
#include "commonincludes.hpp"
|
||||
#include "socketaddress.h"
|
||||
-
|
||||
+#include <sys/uio.h>
|
||||
|
||||
static void GetLocalPortNumberFromSocket(int sockfd, CSocketAddress* pAddr)
|
||||
{
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-services_virus_scan_clamd_mod_c,v 1.1 2013/11/05 15:05:04 sthen Exp $
|
||||
--- services/virus_scan/clamd_mod.c.orig Tue Nov 5 14:35:15 2013
|
||||
+++ services/virus_scan/clamd_mod.c Tue Nov 5 14:35:01 2013
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
#include <assert.h>
|
||||
#include <sys/socket.h>
|
||||
+#include <sys/uio.h>
|
||||
#include <sys/un.h>
|
||||
#include <errno.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user