From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 20 Mar 2014 12:42:42 +0000 (+0000)
Subject: Issue #10141: updated new usages of AF_CAN to be in #ifdef AF_CAN rather than #ifdef... 
X-Git-Tag: v3.4.1rc1~209^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecfc98c67b2571f0d212eb91efb556181c12dc92;p=python

Issue #10141: updated new usages of AF_CAN to be in #ifdef AF_CAN rather than #ifdef HAVE_LINUX_CAN_H to allow compilation on older Linuxes.
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index a1e5da8bc0..7add6b6651 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1165,7 +1165,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;
@@ -1589,7 +1589,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:
@@ -1796,7 +1796,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);