From 81ce95ff11a77867ec4bd0a857e9c21e74780e24 Mon Sep 17 00:00:00 2001
From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Sun, 15 May 2011 13:16:22 +0200
Subject: Fix _socket compilation failures on non-Linux buildbots (cf. issue
 #1746656).

---
 Modules/socketmodule.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Modules/socketmodule.h')

diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index f064795b80..db44fd368d 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -59,9 +59,12 @@ typedef int socklen_t;
 #include <bluetooth.h>
 #endif
 
+#ifdef HAVE_NET_IF_H
+# include <net/if.h>
+#endif
+
 #ifdef HAVE_NETPACKET_PACKET_H
 # include <sys/ioctl.h>
-# include <net/if.h>
 # include <netpacket/packet.h>
 #endif
 
-- 
cgit v1.2.1


From f71c8ffe68bf37c465073eaa099ab334afbe2dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Fran=C3=A7ois=20Natali?= <neologix@free.fr>
Date: Thu, 6 Oct 2011 19:47:44 +0200
Subject: =?UTF-8?q?Issue=20#10141:=20socket:=20add=20SocketCAN=20(PF=5FCAN?=
 =?UTF-8?q?)=20support.=20Initial=20patch=20by=20Matthias=20Fuchs,=20updat?=
 =?UTF-8?q?ed=20by=20Tiago=20Gon=C3=A7alves.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Modules/socketmodule.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'Modules/socketmodule.h')

diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index db44fd368d..13e33d5abe 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -72,6 +72,14 @@ typedef int socklen_t;
 # include <linux/tipc.h>
 #endif
 
+#ifdef HAVE_LINUX_CAN_H
+#include <linux/can.h>
+#endif
+
+#ifdef HAVE_LINUX_CAN_RAW_H
+#include <linux/can/raw.h>
+#endif
+
 #ifndef Py__SOCKET_H
 #define Py__SOCKET_H
 #ifdef __cplusplus
@@ -126,6 +134,9 @@ typedef union sock_addr {
 #ifdef HAVE_NETPACKET_PACKET_H
     struct sockaddr_ll ll;
 #endif
+#ifdef HAVE_LINUX_CAN_H
+    struct sockaddr_can can;
+#endif
 } sock_addr_t;
 
 /* The object holding a socket.  It holds some extra information,
-- 
cgit v1.2.1


From 0faa408730915d039e8bb08ac1790c396e20ec04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Fran=C3=A7ois=20Natali?= <neologix@free.fr>
Date: Fri, 23 Dec 2011 16:44:51 +0100
Subject: Issue #8623: Fix some strict-aliasing warnings. Patch by David
 Watson.

---
 Modules/socketmodule.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Modules/socketmodule.h')

diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index 13e33d5abe..59d4cb13e0 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -115,6 +115,7 @@ typedef int SOCKET_T;
 /* Socket address */
 typedef union sock_addr {
     struct sockaddr_in in;
+    struct sockaddr sa;
 #ifdef AF_UNIX
     struct sockaddr_un un;
 #endif
-- 
cgit v1.2.1


From 40fec6c97b8b2fb8328caead4efcfabbdb3fb7de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 3 Feb 2012 17:44:58 +0100
Subject: Issue #13777: Add PF_SYSTEM sockets on OS X. Patch by Michael
 Goderbauer.

---
 Modules/socketmodule.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'Modules/socketmodule.h')

diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index 59d4cb13e0..0435878721 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -80,6 +80,13 @@ typedef int socklen_t;
 #include <linux/can/raw.h>
 #endif
 
+#ifdef HAVE_SYS_SYS_DOMAIN_H
+#include <sys/sys_domain.h>
+#endif
+#ifdef HAVE_SYS_KERN_CONTROL_H
+#include <sys/kern_control.h>
+#endif
+
 #ifndef Py__SOCKET_H
 #define Py__SOCKET_H
 #ifdef __cplusplus
@@ -138,6 +145,9 @@ typedef union sock_addr {
 #ifdef HAVE_LINUX_CAN_H
     struct sockaddr_can can;
 #endif
+#ifdef HAVE_SYS_KERN_CONTROL_H
+    struct sockaddr_ctl ctl;
+#endif
 } sock_addr_t;
 
 /* The object holding a socket.  It holds some extra information,
-- 
cgit v1.2.1