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

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

Issue 9826025: Import libusb 1.0.9-rc3 into third_party (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaning up import instructions 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/msvc/stdint.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
new file mode 100644
index 0000000000000000000000000000000000000000..b093e73e19132d87e03eeec56412c27b5ddbb252
--- /dev/null
+++ b/third_party/libusb/windows-build.patch
@@ -0,0 +1,42 @@
+diff --git a/libusb/os/poll_windows.h b/libusb/os/poll_windows.h
+index fee89f5..27986b8 100644
+--- a/libusb/os/poll_windows.h
++++ b/libusb/os/poll_windows.h
+@@ -19,6 +19,9 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
++
++#ifndef LIBUSB_POLL_WINDOWS_H
++#define LIBUSB_POLL_WINDOWS_H
+ #pragma once
+
+ #if defined(_MSC_VER)
+@@ -57,12 +60,6 @@ extern enum windows_version windows_version;
+ #define POLLHUP 0x0010 /* Hung up */
+ #define POLLNVAL 0x0020 /* Invalid request: fd not open */
+
+-struct pollfd {
+- int fd; /* file descriptor */
+- short events; /* requested events */
+- short revents; /* returned events */
+-};
+-
+ // access modes
+ enum rw_type {
+ RW_NONE,
+@@ -118,3 +115,4 @@ do { \
+ } while (0)
+ #endif
+
++#endif /* LIBUSB_POLL_WINDOWS_H */
+diff --git a/msvc/config.h b/msvc/config.h
+index 43b4d4e..9ac6134 100644
+--- a/msvc/config.h
++++ b/msvc/config.h
+@@ -19,3 +19,5 @@
+
+ /* type of second poll() argument */
+ #define POLL_NFDS_TYPE unsigned int
++
++#include <Winsock2.h>
« no previous file with comments | « third_party/libusb/msvc/stdint.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698