Issue #20065: socketmodule: Fix build error when AF_CAN is defined without the

cf-natali · cf-natali · commit b4062e8f8a45 · 2014-02-08T22:54:11.000+01:00
proper CAN headers.
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1226,7 +1226,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)`
`1226`	`1226`	`}`
`1227`	`1227`	`#endif`
`1228`	`1228`
`1229`		`-#ifdef AF_CAN`
	`1229`	`+#ifdef HAVE_LINUX_CAN_H`
`1230`	`1230`	`case AF_CAN:`
`1231`	`1231`	`{`
`1232`	`1232`	`struct sockaddr_can a = (struct sockaddr_can )addr;`
`@@ -1654,7 +1654,7 @@ getsockaddrarg(PySocketSockObject s, PyObject args,`
`1654`	`1654`	`}`
`1655`	`1655`	`#endif`
`1656`	`1656`
`1657`		`-#ifdef AF_CAN`
	`1657`	`+#ifdef HAVE_LINUX_CAN_H`
`1658`	`1658`	`case AF_CAN:`
`1659`	`1659`	`switch (s->sock_proto) {`
`1660`	`1660`	`case CAN_RAW:`
`@@ -1859,7 +1859,7 @@ getsockaddrlen(PySocketSockObject s, socklen_t len_ret)`
`1859`	`1859`	`}`
`1860`	`1860`	`#endif`
`1861`	`1861`
`1862`		`-#ifdef AF_CAN`
	`1862`	`+#ifdef HAVE_LINUX_CAN_H`
`1863`	`1863`	`case AF_CAN:`
`1864`	`1864`	`{`
`1865`	`1865`	`*len_ret = sizeof (struct sockaddr_can);`