Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: third_party/libusb/windows-build.patch

Issue 9969185: third_party/libusb: vs2010 build fixes and android-conditional build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libusb/libusb/os/windows_usb.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libusb/windows-build.patch
diff --git a/third_party/libusb/windows-build.patch b/third_party/libusb/windows-build.patch
index b093e73e19132d87e03eeec56412c27b5ddbb252..3feba5a318c44a0cb9045fe448798f550602198e 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
« no previous file with comments | « third_party/libusb/libusb/os/windows_usb.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698