diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-02 14:59:08 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-06-02 14:59:08 -0700 |
| commit | 620b2c21f90c8deb5edc21c5f323c600fc7acba8 (patch) | |
| tree | c2548da92c95e4c4dd708408d10eef64e44ba411 | |
| parent | b4fb8ae86d0fb5275e496a6e7689241efa25df8a (diff) | |
| parent | 76c1e27cec48bdc7559494e1f7d4eb75b3592cbe (diff) | |
Merge pull request #440 from baruchsiach/fix-uclinux
Fix uclinux
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | pcap-linux.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.in b/configure.in index be4b29e2..31287d0d 100644 --- a/configure.in +++ b/configure.in @@ -149,7 +149,7 @@ struct rtentry; fi case "$host_os" in -linux*) +linux*|uclinux*) AC_CHECK_HEADERS(linux/sockios.h linux/if_bonding.h,,, [ #include <sys/socket.h> diff --git a/pcap-linux.c b/pcap-linux.c index bb4619bb..183dd639 100644 --- a/pcap-linux.c +++ b/pcap-linux.c @@ -955,7 +955,8 @@ added: static int is_bonding_device(int fd, const char *device) { -#if defined(BOND_INFO_QUERY_OLD) || defined(SIOCBONDINFOQUERY) +#if defined(HAVE_LINUX_IF_BONDING_H) && \ + (defined(BOND_INFO_QUERY_OLD) || defined(SIOCBONDINFOQUERY)) struct ifreq ifr; ifbond ifb; @@ -969,7 +970,8 @@ is_bonding_device(int fd, const char *device) if (ioctl(fd, BOND_INFO_QUERY_OLD, &ifr) == 0) #endif /* SIOCBONDINFOQUERY */ return 1; /* success, so it's a bonding device */ -#endif /* defined(BOND_INFO_QUERY_OLD) || defined(SIOCBONDINFOQUERY) */ +#endif /* defined(HAVE_LINUX_IF_BONDING_H) && \ + (defined(BOND_INFO_QUERY_OLD) || defined(SIOCBONDINFOQUERY)) */ return 0; /* no, it's not a bonding device */ } |