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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/libusb/msvc/stdint.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 diff --git a/libusb/os/poll_windows.h b/libusb/os/poll_windows.h
2 index fee89f5..27986b8 100644
3 --- a/libusb/os/poll_windows.h
4 +++ b/libusb/os/poll_windows.h
5 @@ -19,6 +19,9 @@
6 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
7 *
8 */
9 +
10 +#ifndef LIBUSB_POLL_WINDOWS_H
11 +#define LIBUSB_POLL_WINDOWS_H
12 #pragma once
13
14 #if defined(_MSC_VER)
15 @@ -57,12 +60,6 @@ extern enum windows_version windows_version;
16 #define POLLHUP 0x0010 /* Hung up */
17 #define POLLNVAL 0x0020 /* Invalid request: fd not open */
18
19 -struct pollfd {
20 - int fd; /* file descriptor */
21 - short events; /* requested events */
22 - short revents; /* returned events */
23 -};
24 -
25 // access modes
26 enum rw_type {
27 RW_NONE,
28 @@ -118,3 +115,4 @@ do { \
29 } while (0)
30 #endif
31
32 +#endif /* LIBUSB_POLL_WINDOWS_H */
33 diff --git a/msvc/config.h b/msvc/config.h
34 index 43b4d4e..9ac6134 100644
35 --- a/msvc/config.h
36 +++ b/msvc/config.h
37 @@ -19,3 +19,5 @@
38
39 /* type of second poll() argument */
40 #define POLL_NFDS_TYPE unsigned int
41 +
42 +#include <Winsock2.h>
OLDNEW
« 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