Skip to content

C
cpython
Kaydet (Commit) 9f9f0e23 authored tarafından Vinay Sajip's avatar Vinay Sajip
Dosyalara gözat
Seçenekler

Merged from 3.4.

üst 5782e25d ecfc98c6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Modules/socketmodule.c
Dosyayı görüntüle @ 9f9f0e23
...@@ -1165,7 +1165,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto) ...@@ -1165,7 +1165,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
} }
#endif #endif
#ifdef HAVE_LINUX_CAN_H #ifdef AF_CAN
case AF_CAN: case AF_CAN:
{ {
struct sockaddr_can *a = (struct sockaddr_can *)addr; struct sockaddr_can *a = (struct sockaddr_can *)addr;
...@@ -1589,7 +1589,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, ...@@ -1589,7 +1589,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
} }
#endif #endif
#ifdef HAVE_LINUX_CAN_H #ifdef AF_CAN
case AF_CAN: case AF_CAN:
switch (s->sock_proto) { switch (s->sock_proto) {
case CAN_RAW: case CAN_RAW:
...@@ -1796,7 +1796,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret) ...@@ -1796,7 +1796,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
} }
#endif #endif
#ifdef HAVE_LINUX_CAN_H #ifdef AF_CAN
case AF_CAN: case AF_CAN:
{ {
*len_ret = sizeof (struct sockaddr_can); *len_ret = sizeof (struct sockaddr_can);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment