diff options
| author | Chris Dickens <christopher.a.dickens@gmail.com> | 2016-01-28 14:15:29 -0800 |
|---|---|---|
| committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2016-02-23 22:43:34 -0800 |
| commit | 3f4df898b7b7998d5c1353c2d03c7258c17f0489 (patch) | |
| tree | 2d84889769d385782f4f3967dd3b55241145e576 | |
| parent | 448584afd1b012210e8e9038f888597588450d7a (diff) | |
| download | libusb-3f4df898b7b7998d5c1353c2d03c7258c17f0489.tar.gz | |
linux_netlink: Remove unnecessary header includes and conditionals
We always require <sys/socket.h> and do not need <linux/filter.h>.
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | libusb/os/linux_netlink.c | 11 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
3 files changed, 3 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index ec71e62..4e35bf6 100644 --- a/configure.ac +++ b/configure.ac @@ -113,14 +113,12 @@ linux) AC_CHECK_LIB([udev], [udev_new], [], [AC_ERROR(["udev support requested but libudev not installed"])]) AC_DEFINE(USE_UDEV, 1, [Use udev for device enumeration/hotplug]) else - AC_CHECK_HEADERS([asm/types.h sys/socket.h], [], []) - AC_CHECK_HEADERS([linux/netlink.h linux/filter.h], [], [AC_ERROR(["Linux netlink headers not found"])], [ + AC_CHECK_HEADERS([asm/types.h], [], []) + AC_CHECK_HEADERS([sys/socket.h linux/netlink.h], [], [AC_ERROR(["Linux netlink headers not found"])], [ #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> #endif -#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> -#endif ]) fi AC_SUBST(USE_UDEV) diff --git a/libusb/os/linux_netlink.c b/libusb/os/linux_netlink.c index 5976e91..5ad1e62 100644 --- a/libusb/os/linux_netlink.c +++ b/libusb/os/linux_netlink.c @@ -36,19 +36,8 @@ #include <asm/types.h> #endif -#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> -#endif - -#include <arpa/inet.h> - -#ifdef HAVE_LINUX_NETLINK_H #include <linux/netlink.h> -#endif - -#ifdef HAVE_LINUX_FILTER_H -#include <linux/filter.h> -#endif #include "libusbi.h" #include "linux_usbfs.h" diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 9ea07cd..b7a0eb1 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11049 +#define LIBUSB_NANO 11050 |