From: Charles-François Natali <cf.natali@gmail.com>
Date: Sat, 8 Feb 2014 21:54:11 +0000 (+0100)
Subject: Issue #20065: socketmodule: Fix build error when AF_CAN is defined without the
X-Git-Tag: v3.4.0rc1~32^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4062e8f8a4515aa14550b1cd79fb4feaed95b5c;p=thirdparty%2FPython%2Fcpython.git

Issue #20065: socketmodule: Fix build error when AF_CAN is defined without the
proper CAN headers.
---

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