diff options
| author | Pete Batard <pete@akeo.ie> | 2013-02-18 22:22:01 +0000 |
|---|---|---|
| committer | Pete Batard <pete@akeo.ie> | 2013-02-18 22:22:01 +0000 |
| commit | eea7ebe6ca5645bc3a80b8f3c9a1627cf6884ee9 (patch) | |
| tree | bc8363c07b5e9352e18c74a3d5170654af5f687b | |
| parent | 9ae570065668ad89fe38afbb5d6f9e60f54a0945 (diff) | |
| download | libusb-eea7ebe6ca5645bc3a80b8f3c9a1627cf6884ee9.tar.gz | |
Windows: Fix broken WDK compilation
* 790ffc78b008a03c95d10899f53997b504f55c72 moved the inclusion of poll_windows.h
after the use of struct timeval, which removed the hidden winsock.h include
where timeval is defined on the WDK.
* Make the winsock.h include explicit
| -rw-r--r-- | libusb/libusbi.h | 3 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libusb/libusbi.h b/libusb/libusbi.h index e296a2c..f81b5d1 100644 --- a/libusb/libusbi.h +++ b/libusb/libusbi.h @@ -30,6 +30,9 @@ #ifdef HAVE_POLL_H #include <poll.h> #endif +#ifdef DDKBUILD +#include <winsock.h> // needed for struct timeval for WDK +#endif #include "libusb.h" #include "version.h" diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 0422f9d..abfd4b3 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10615 +#define LIBUSB_NANO 10616 |