diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2014-03-20 12:43:50 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2014-03-20 12:43:50 (GMT) |
| commit | 9f9f0e23a1e68190eb0d9938d16f10fe809daf09 (patch) | |
| tree | 6345a7ef200e6c1e20957f7f1312769250a5949a /Modules | |
| parent | 5782e25dfe401dddfde091417c977b44e4442cb6 (diff) | |
| parent | ecfc98c67b2571f0d212eb91efb556181c12dc92 (diff) | |
| download | cpython-9f9f0e23a1e68190eb0d9938d16f10fe809daf09.zip cpython-9f9f0e23a1e68190eb0d9938d16f10fe809daf09.tar.gz cpython-9f9f0e23a1e68190eb0d9938d16f10fe809daf09.tar.bz2 | |
Merged from 3.4.
Diffstat (limited to 'Modules')
| -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); |