This updates the common poll code used by Windows and Windows CE to
use the libusb_event_handle typedef instead of int for file
descriptors.
---
libusb/os/poll_windows.c | 8 ++++----
libusb/os/poll_windows.h | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/libusb/os/poll_windows.c b/libusb/os/poll_windows.c
index 7ed19ba..6d4f934 100644
--- a/libusb/os/poll_windows.c
+++ b/libusb/os/poll_windows.c
@@ -256,7 +256,7 @@ void exit_polling(void)
* event. To that extent, we create a single wfd and overlapped as a means
* to access that event.
*/
-int usbi_pipe(int filedes[2])
+int usbi_pipe(libusb_event_handle filedes[2])
{
int i;
OVERLAPPED* overlapped;
@@ -626,7 +626,7 @@ poll_exit:
/*
* close a fake pipe fd
*/
-int usbi_close(int fd)
+int usbi_close(libusb_event_handle fd)
{
int _index;
int r = -1;
@@ -648,7 +648,7 @@ int usbi_close(int fd)
/*
* synchronous write for fake "pipe" signaling
*/
-ssize_t usbi_write(int fd, const void *buf, size_t count)
+ssize_t usbi_write(libusb_event_handle fd, const void *buf, size_t count)
{
int _index;
UNUSED(buf);
@@ -684,7 +684,7 @@ ssize_t usbi_write(int fd, const void *buf, size_t count)
/*
* synchronous read for fake "pipe" signaling
*/
-ssize_t usbi_read(int fd, void *buf, size_t count)
+ssize_t usbi_read(libusb_event_handle fd, void *buf, size_t count)
{
int _index;
ssize_t r = -1;
diff --git a/libusb/os/poll_windows.h b/libusb/os/poll_windows.h
index deed206..b52031b 100644
--- a/libusb/os/poll_windows.h
+++ b/libusb/os/poll_windows.h
@@ -59,7 +59,7 @@ extern enum windows_version windows_version;
#define POLLNVAL 0x0020 /* Invalid request: fd not open */
struct pollfd {
- int fd; /* file descriptor */
+ libusb_event_handle fd; /* file descriptor */
short events; /* requested events */
short revents; /* returned events */
};
@@ -84,11 +84,11 @@ struct winfd {
};
extern const struct winfd INVALID_WINFD;
-int usbi_pipe(int pipefd[2]);
+int usbi_pipe(libusb_event_handle pipefd[2]);
int usbi_poll(struct pollfd *fds, unsigned int nfds, int timeout);
-ssize_t usbi_write(int fd, const void *buf, size_t count);
-ssize_t usbi_read(int fd, void *buf, size_t count);
-int usbi_close(int fd);
+ssize_t usbi_write(libusb_event_handle fd, const void *buf, size_t count);
+ssize_t usbi_read(libusb_event_handle fd, void *buf, size_t count);
+int usbi_close(libusb_event_handle fd);
void init_polling(void);
void exit_polling(void);
--
1.7.9.5
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
libusbx-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/libusbx-devel
