diff options
| author | Giampaolo Rodola' <g.rodola@gmail.com> | 2014-03-20 20:44:53 (GMT) |
|---|---|---|
| committer | Giampaolo Rodola' <g.rodola@gmail.com> | 2014-03-20 20:44:53 (GMT) |
| commit | 265ae86414f2a70643bad4b487f07da1c2bba50a (patch) | |
| tree | 2e3a403511d8628f45a9e7a2c3a75fa9c84c72a1 /Modules/socketmodule.c | |
| parent | f97e82937f8a4e14df939007abacfa252ad09fc8 (diff) | |
| parent | a0934b2c1b939fdebee8dc18d49a0f6c52324773 (diff) | |
| download | cpython-265ae86414f2a70643bad4b487f07da1c2bba50a.zip cpython-265ae86414f2a70643bad4b487f07da1c2bba50a.tar.gz cpython-265ae86414f2a70643bad4b487f07da1c2bba50a.tar.bz2 | |
merge heads
Diffstat (limited to 'Modules/socketmodule.c')
| -rw-r--r-- | Modules/socketmodule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index a1e5da8..7add6b6 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); |