all: Fix compilation when u_int*_t are not defined and used by usb.h

This commit is contained in:
Pali Rohár committed 2016-12-16 15:39:46 +01:00
1 parent 6ec64f4992
commit 7522a9fbc7
4 files changed
+13 -12

No files matched your search

+6 -8
View File
@@ -31,14 +31,6 @@
#include <signal.h>
#include <dlfcn.h>
#include <usb.h>
#ifdef __linux__
#ifdef LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
#include <sys/ioctl.h>
#endif
#endif
#include "global.h"
#include "device.h"
#include "usb-device.h"
@@ -47,6 +39,12 @@
#include "cold-flash.h"
#include "mkii.h"
#ifdef __linux__
#ifdef LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
#include <sys/ioctl.h>
#endif
#endif
static struct usb_flash_device usb_devices[] = {
{ 0x0421, 0x0096, -1, -1, -1, FLASH_DISK, { DEVICE_RX_44, 0 } },
{ 0x0421, 0x0105, 2, 1, -1, FLASH_NOLO, { DEVICE_SU_18, DEVICE_RX_44, DEVICE_RX_48, DEVICE_RX_51, DEVICE_RM_680, 0 } },