OLD | NEW |
1 diff --git a/libusb/os/poll_windows.h b/libusb/os/poll_windows.h | 1 diff --git a/libusb/os/poll_windows.h b/libusb/os/poll_windows.h |
2 index fee89f5..27986b8 100644 | 2 index fee89f5..27986b8 100644 |
3 --- a/libusb/os/poll_windows.h | 3 --- a/libusb/os/poll_windows.h |
4 +++ b/libusb/os/poll_windows.h | 4 +++ b/libusb/os/poll_windows.h |
5 @@ -19,6 +19,9 @@ | 5 @@ -19,6 +19,9 @@ |
6 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 6 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
7 * | 7 * |
8 */ | 8 */ |
9 + | 9 + |
10 +#ifndef LIBUSB_POLL_WINDOWS_H | 10 +#ifndef LIBUSB_POLL_WINDOWS_H |
(...skipping 12 matching lines...) Expand all Loading... |
23 -}; | 23 -}; |
24 - | 24 - |
25 // access modes | 25 // access modes |
26 enum rw_type { | 26 enum rw_type { |
27 RW_NONE, | 27 RW_NONE, |
28 @@ -118,3 +115,4 @@ do { \ | 28 @@ -118,3 +115,4 @@ do { \ |
29 } while (0) | 29 } while (0) |
30 #endif | 30 #endif |
31 | 31 |
32 +#endif /* LIBUSB_POLL_WINDOWS_H */ | 32 +#endif /* LIBUSB_POLL_WINDOWS_H */ |
| 33 diff --git a/libusb/os/windows_usb.h b/libusb/os/windows_usb.h |
| 34 index b629d18..6dbfaf5 100644 |
| 35 --- a/libusb/os/windows_usb.h |
| 36 +++ b/libusb/os/windows_usb.h |
| 37 @@ -101,8 +101,6 @@ const GUID GUID_DEVINTERFACE_USB_DEVICE = { 0xA5DCBF10, 0x65
30, 0x11D2, {0x90, 0 |
| 38 #if !defined(GUID_DEVINTERFACE_USB_HUB) |
| 39 const GUID GUID_DEVINTERFACE_USB_HUB = { 0xF18A0E88, 0xC30C, 0x11D0, {0x88, 0x1
5, 0x00, 0xA0, 0xC9, 0x06, 0xBE, 0xD8} }; |
| 40 #endif |
| 41 -const GUID GUID_NULL = { 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0
x00, 0x00, 0x00, 0x00} }; |
| 42 - |
| 43 |
| 44 /* |
| 45 * Multiple USB API backend support |
33 diff --git a/msvc/config.h b/msvc/config.h | 46 diff --git a/msvc/config.h b/msvc/config.h |
34 index 43b4d4e..9ac6134 100644 | 47 index 43b4d4e..9ac6134 100644 |
35 --- a/msvc/config.h | 48 --- a/msvc/config.h |
36 +++ b/msvc/config.h | 49 +++ b/msvc/config.h |
37 @@ -19,3 +19,5 @@ | 50 @@ -19,3 +19,5 @@ |
38 | 51 |
39 /* type of second poll() argument */ | 52 /* type of second poll() argument */ |
40 #define POLL_NFDS_TYPE unsigned int | 53 #define POLL_NFDS_TYPE unsigned int |
41 + | 54 + |
42 +#include <Winsock2.h> | 55 +#include <Winsock2.h> |
OLD | NEW |