Commit 1ba3fd5d authored by Martin v. Löwis's avatar Martin v. Löwis

Autotest for netpacket/packet.h, as it is not available on all Linux versions.

Depend AF_PACKET on HAVE_NETPACKET_PACKET_H. Fixes #449157
parent 05ac6de2
...@@ -179,7 +179,7 @@ Socket methods: ...@@ -179,7 +179,7 @@ Socket methods:
#undef AF_UNIX #undef AF_UNIX
#endif #endif
#if defined(linux) && defined(AF_PACKET) #ifdef HAVE_NETPACKET_PACKET_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <net/if.h> #include <net/if.h>
#include <netpacket/packet.h> #include <netpacket/packet.h>
...@@ -476,7 +476,7 @@ typedef struct { ...@@ -476,7 +476,7 @@ typedef struct {
struct sockaddr_in6 in6; struct sockaddr_in6 in6;
struct sockaddr_storage storage; struct sockaddr_storage storage;
#endif #endif
#if defined(linux) && defined(AF_PACKET) #ifdef HAVE_NETPACKET_PACKET_H
struct sockaddr_ll ll; struct sockaddr_ll ll;
#endif #endif
} sock_addr; } sock_addr;
...@@ -715,7 +715,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen) ...@@ -715,7 +715,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen)
} }
#endif #endif
#if defined(linux) && defined(AF_PACKET) #ifdef HAVE_NETPACKET_PACKET_H
case AF_PACKET: case AF_PACKET:
{ {
struct sockaddr_ll *a = (struct sockaddr_ll *)addr; struct sockaddr_ll *a = (struct sockaddr_ll *)addr;
...@@ -828,7 +828,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, ...@@ -828,7 +828,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
} }
#endif #endif
#if defined(linux) && defined(AF_PACKET) #ifdef HAVE_NETPACKET_PACKET_H
case AF_PACKET: case AF_PACKET:
{ {
struct sockaddr_ll* addr; struct sockaddr_ll* addr;
...@@ -901,7 +901,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret) ...@@ -901,7 +901,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
} }
#endif #endif
#if defined(linux) && defined(AF_PACKET) #ifdef HAVE_NETPACKET_PACKET_H
case AF_PACKET: case AF_PACKET:
{ {
*len_ret = sizeof (struct sockaddr_ll); *len_ret = sizeof (struct sockaddr_ll);
...@@ -2983,7 +2983,7 @@ init_socket(void) ...@@ -2983,7 +2983,7 @@ init_socket(void)
#ifdef AF_ROSE #ifdef AF_ROSE
insint(d, "AF_ROSE", AF_ROSE); /* Amateur Radio X.25 PLP */ insint(d, "AF_ROSE", AF_ROSE); /* Amateur Radio X.25 PLP */
#endif #endif
#if defined(linux) && defined(AF_PACKET) #ifdef HAVE_NETPACKET_PACKET_H
insint(d, "AF_PACKET", AF_PACKET); insint(d, "AF_PACKET", AF_PACKET);
insint(d, "PF_PACKET", PF_PACKET); insint(d, "PF_PACKET", PF_PACKET);
insint(d, "PACKET_HOST", PACKET_HOST); insint(d, "PACKET_HOST", PACKET_HOST);
......
...@@ -419,7 +419,7 @@ signal.h stdarg.h stddef.h stdlib.h thread.h unistd.h utime.h termios.h \ ...@@ -419,7 +419,7 @@ signal.h stdarg.h stddef.h stdlib.h thread.h unistd.h utime.h termios.h \
sys/audioio.h sys/file.h sys/lock.h sys/modem.h db_185.h db.h \ sys/audioio.h sys/file.h sys/lock.h sys/modem.h db_185.h db.h \
sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \ sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \ sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
ndbm.h db1/ndbm.h gdbm/ndbm.h sys/resource.h) ndbm.h db1/ndbm.h gdbm/ndbm.h sys/resource.h netpacket/packet.h)
AC_HEADER_DIRENT AC_HEADER_DIRENT
# checks for typedefs # checks for typedefs
......
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