diff options
author | hselasky <hselasky@FreeBSD.org> | 2013-03-13 12:23:14 +0000 |
---|---|---|
committer | hselasky <hselasky@FreeBSD.org> | 2013-03-13 12:23:14 +0000 |
commit | 0b8d7927213de8679fda3f58d460b754fe2f65f0 (patch) | |
tree | 4cb297d97b46e9075c87640bb84c7ec92616125a /lib/libusb/libusb10.c | |
parent | 1e99f9b1455315f445d71a02aa21482c6507b87a (diff) | |
download | FreeBSD-src-0b8d7927213de8679fda3f58d460b754fe2f65f0.zip FreeBSD-src-0b8d7927213de8679fda3f58d460b754fe2f65f0.tar.gz |
- Make the FreeBSD's USB library compile under Linux.
- Fix a compile warning where the return value of a call
to a write() function was ignored.
- Remove redundant include files from userland USB header files.
- Add some now needed include files to various C-files.
Diffstat (limited to 'lib/libusb/libusb10.c')
-rw-r--r-- | lib/libusb/libusb10.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index 256d67e..0212296 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -25,17 +25,23 @@ * SUCH DAMAGE. */ -#include <sys/fcntl.h> -#include <sys/ioctl.h> -#include <sys/queue.h> - +#ifdef LIBUSB_GLOBAL_INCLUDE_FILE +#include LIBUSB_GLOBAL_INCLUDE_FILE +#else #include <assert.h> #include <errno.h> #include <poll.h> #include <pthread.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <unistd.h> +#include <time.h> +#include <sys/fcntl.h> +#include <sys/ioctl.h> +#include <sys/queue.h> +#include <sys/endian.h> +#endif #define libusb_device_handle libusb20_device @@ -1331,7 +1337,7 @@ failure: /* make sure our event loop spins the done handler */ dummy = 0; - write(dev->ctx->ctrl_pipe[1], &dummy, sizeof(dummy)); + err = write(dev->ctx->ctrl_pipe[1], &dummy, sizeof(dummy)); } /* The following function must be called unlocked */ |