cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arpa/inet.h and netinet/in.h can now be #included in either order

Browse Source
This commit is contained in:
naddy 2012-08-05 20:28:51 +00:00
parent 4d8ce8e3ca
commit 8772c908e9
8 changed files with 6 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
misc/memcached/patches/patch-testapp_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-testapp_c,v 1.3 2010/07/30 15:28:14 naddy Exp $
--- testapp.c.orig Fri Jul 30 17:24:26 2010
+++ testapp.c Fri Jul 30 17:25:17 2010
@@ -5,9 +5,9 @@
#include <sys/socket.h>
#include <sys/wait.h>
#include <netdb.h>
-#include <arpa/inet.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
+#include <arpa/inet.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
@@ -15,7 +15,6 @@
#include <assert.h>
#include <string.h>
#include <unistd.h>
-#include <netinet/in.h>
#include <fcntl.h>
#include "config.h"

14
net/putty/patches/patch-unix_uxnet_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-unix_uxnet_c,v 1.1 2010/07/22 14:26:53 landry Exp $
Make sure netinet/in.h is included before arpa/inet.h
--- unix/uxnet.c.orig Thu Jul 22 16:20:22 2010
+++ unix/uxnet.c Thu Jul 22 16:20:34 2010
@@ -11,8 +11,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
-#include <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <netdb.h>
#include <sys/un.h>

13
net/spectrum-tools/patches/patch-spectool_net_client_h
View File

@ -1,14 +1,11 @@
$OpenBSD: patch-spectool_net_client_h,v 1.2 2012/02/16 21:26:55 sthen Exp $
--- spectool_net_client.h.orig Fri Jun 10 16:53:29 2011
+++ spectool_net_client.h Sun Jan 22 11:34:31 2012
@@ -23,8 +23,9 @@
$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 <arpa/inet.h>
+#include <sys/uio.h>
#include <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <unistd.h>
#include <netdb.h>
#include <fcntl.h>

13
net/spectrum-tools/patches/patch-spectool_net_server_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-spectool_net_server_c,v 1.1 2012/02/16 21:26:55 sthen Exp $
--- spectool_net_server.c.orig Sun Jan 22 11:34:54 2012
+++ spectool_net_server.c Sun Jan 22 11:34:57 2012
@@ -23,8 +23,8 @@
#include <sys/time.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
-#include <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <unistd.h>
#include <netdb.h>
#include <fcntl.h>

14
sysutils/collectd/patches/patch-src_teamspeak2_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_teamspeak2_c,v 1.1 2010/07/22 14:40:49 landry Exp $
make sure netinet/in.h is included before arpa/inet.h
--- src/teamspeak2.c.orig Thu Jul 22 16:24:09 2010
+++ src/teamspeak2.c Thu Jul 22 16:24:16 2010
@@ -25,8 +25,8 @@
#include "common.h"
#include "plugin.h"
-#include <arpa/inet.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>

15
www/hiawatha/patches/patch-libip_h
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-libip_h,v 1.1 2010/09/22 15:03:45 ajacoutot Exp $
--- libip.h.orig Wed Sep 22 16:50:32 2010
+++ libip.h Wed Sep 22 16:50:39 2010
@@ -13,10 +13,10 @@
#define _LIBIP_H
#include <stdbool.h>
-#include <arpa/inet.h>
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
+#include <arpa/inet.h>
#define IPv4_LEN sizeof(struct in_addr)
#ifdef HAVE_IPV6

18
x11/remmina/patches/patch-remmina-plugins_common_remmina_plugin_h
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-remmina-plugins_common_remmina_plugin_h,v 1.1 2012/02/24 13:48:26 ajacoutot Exp $
--- remmina-plugins/common/remmina_plugin.h.orig Fri Feb 24 11:55:15 2012
+++ remmina-plugins/common/remmina_plugin.h Fri Feb 24 11:55:06 2012
@@ -36,11 +36,11 @@
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>

18
x11/remmina/patches/patch-remmina_src_remmina_ssh_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-remmina_src_remmina_ssh_c,v 1.2 2012/06/25 14:24:34 mpi Exp $
$OpenBSD: patch-remmina_src_remmina_ssh_c,v 1.3 2012/08/05 20:28:51 naddy Exp $
https://github.com/FreeRDP/Remmina/issues/59
@ -11,22 +11,6 @@ Add support for openpty(3)
--- remmina/src/remmina_ssh.c.orig Fri Feb 10 19:54:23 2012
+++ remmina/src/remmina_ssh.c Sat Jun 23 17:56:39 2012
@@ -36,12 +36,12 @@
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
@@ -54,6 +54,9 @@
#ifdef HAVE_TERMIOS_H
#include <termios.h>