diff options
| author | gdk@chromium.org <gdk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 17:38:41 +0000 |
|---|---|---|
| committer | gdk@chromium.org <gdk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 17:38:41 +0000 |
| commit | 8a3d0caf6592ccdf69583edd8e08f9eff9e916f7 (patch) | |
| tree | 8d420ecec958c92a7188d2e133d56caf0f5750f1 /third_party/libusb | |
| parent | 7dc8cb44d8d8741e4edaf03895aded7255031ef4 (diff) | |
| download | chromium_src-8a3d0caf6592ccdf69583edd8e08f9eff9e916f7.zip chromium_src-8a3d0caf6592ccdf69583edd8e08f9eff9e916f7.tar.gz chromium_src-8a3d0caf6592ccdf69583edd8e08f9eff9e916f7.tar.bz2 | |
third_party/libusb: vs2010 build fixes and android-conditional build
This patch fixes the libusb vs2010 build break as reported by a few people, as
well as makes the libusb build conditional on not being on the Android
platform.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9969185
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libusb')
| -rw-r--r-- | third_party/libusb/libusb.gyp | 3 | ||||
| -rw-r--r-- | third_party/libusb/libusb/os/windows_usb.h | 2 | ||||
| -rw-r--r-- | third_party/libusb/windows-build.patch | 13 |
3 files changed, 15 insertions, 3 deletions
diff --git a/third_party/libusb/libusb.gyp b/third_party/libusb/libusb.gyp index 45a0b1b..6c5ffd4 100644 --- a/third_party/libusb/libusb.gyp +++ b/third_party/libusb/libusb.gyp @@ -36,8 +36,9 @@ }], [ 'OS == "win"', { 'sources': [ - 'libusb/os/windows_usb.c', + 'libusb/os/poll_windows.c', 'libusb/os/threads_windows.c', + 'libusb/os/windows_usb.c', ], 'include_dirs!': [ '.', diff --git a/third_party/libusb/libusb/os/windows_usb.h b/third_party/libusb/libusb/os/windows_usb.h index b629d18..6dbfaf5 100644 --- a/third_party/libusb/libusb/os/windows_usb.h +++ b/third_party/libusb/libusb/os/windows_usb.h @@ -101,8 +101,6 @@ const GUID GUID_DEVINTERFACE_USB_DEVICE = { 0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0 #if !defined(GUID_DEVINTERFACE_USB_HUB) const GUID GUID_DEVINTERFACE_USB_HUB = { 0xF18A0E88, 0xC30C, 0x11D0, {0x88, 0x15, 0x00, 0xA0, 0xC9, 0x06, 0xBE, 0xD8} }; #endif -const GUID GUID_NULL = { 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }; - /* * Multiple USB API backend support diff --git a/third_party/libusb/windows-build.patch b/third_party/libusb/windows-build.patch index b093e73..3feba5a 100644 --- a/third_party/libusb/windows-build.patch +++ b/third_party/libusb/windows-build.patch @@ -30,6 +30,19 @@ index fee89f5..27986b8 100644 #endif +#endif /* LIBUSB_POLL_WINDOWS_H */ +diff --git a/libusb/os/windows_usb.h b/libusb/os/windows_usb.h +index b629d18..6dbfaf5 100644 +--- a/libusb/os/windows_usb.h ++++ b/libusb/os/windows_usb.h +@@ -101,8 +101,6 @@ const GUID GUID_DEVINTERFACE_USB_DEVICE = { 0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0 + #if !defined(GUID_DEVINTERFACE_USB_HUB) + const GUID GUID_DEVINTERFACE_USB_HUB = { 0xF18A0E88, 0xC30C, 0x11D0, {0x88, 0x15, 0x00, 0xA0, 0xC9, 0x06, 0xBE, 0xD8} }; + #endif +-const GUID GUID_NULL = { 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }; +- + + /* + * Multiple USB API backend support diff --git a/msvc/config.h b/msvc/config.h index 43b4d4e..9ac6134 100644 --- a/msvc/config.h |