diff options
| author | Brett Cannon <brett@python.org> | 2014-03-21 15:02:10 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2014-03-21 15:02:10 (GMT) |
| commit | 46f484ee4e56c9e4589a43a20b32c0d65a23e537 (patch) | |
| tree | 82074db069bde6bf9f2143243bfb43ea6c0204dc /Modules/socketmodule.c | |
| parent | a00c2407caed1fe61bdd92788f7a8eb27fcff969 (diff) | |
| parent | ed6783f315c0efe49f981b820332fc5067eace36 (diff) | |
| download | cpython-46f484ee4e56c9e4589a43a20b32c0d65a23e537.zip cpython-46f484ee4e56c9e4589a43a20b32c0d65a23e537.tar.gz cpython-46f484ee4e56c9e4589a43a20b32c0d65a23e537.tar.bz2 | |
merge
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..d0149dd 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 +#if defined(AF_CAN) && defined(CAN_RAW) && defined(CAN_BCM) 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); |