From: Charles-François Natali <neologix@free.fr>
Date: Fri, 7 Oct 2011 20:47:08 +0000 (+0200)
Subject: Issue #10141: fix socketmodule compilation on Linux systems with <linux/can.h>
X-Git-Tag: v3.3.0a1~1250
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30589c9041c906ad63a2c286038f8ef1e2f33fc0;p=thirdparty%2FPython%2Fcpython.git

Issue #10141: fix socketmodule compilation on Linux systems with <linux/can.h>
but without AF_CAN definition.
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index aac1b7294ea3..e64c960faf32 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1220,7 +1220,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
     }
 #endif
 
-#ifdef HAVE_LINUX_CAN_H
+#ifdef AF_CAN
     case AF_CAN:
     {
         struct sockaddr_can *a = (struct sockaddr_can *)addr;
@@ -1606,7 +1606,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
     }
 #endif
 
-#ifdef HAVE_LINUX_CAN_H
+#ifdef AF_CAN
     case AF_CAN:
         switch (s->sock_proto) {
         case CAN_RAW:
@@ -1746,7 +1746,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
     }
 #endif
 
-#ifdef HAVE_LINUX_CAN_H
+#ifdef AF_CAN
     case AF_CAN:
     {
         *len_ret = sizeof (struct sockaddr_can);