Commit 773a00da authored by Igor Filatov's avatar Igor Filatov

Merge remote-tracking branch 'upstream/master' into elan-glib-2.50

parents 29e810d5 21504c06
Pipeline #1797 passed with stage
in 5 minutes and 27 seconds
......@@ -314,7 +314,7 @@ struct fp_pollfd {
int fp_handle_events_timeout(struct timeval *timeout);
int fp_handle_events(void);
size_t fp_get_pollfds(struct fp_pollfd **pollfds);
ssize_t fp_get_pollfds(struct fp_pollfd **pollfds);
int fp_get_next_timeout(struct timeval *tv);
/**
......
......@@ -313,12 +313,12 @@ API_EXPORTED int fp_get_next_timeout(struct timeval *tv)
*
* Returns: the number of pollfds in the resultant list, or negative on error.
*/
API_EXPORTED size_t fp_get_pollfds(struct fp_pollfd **pollfds)
API_EXPORTED ssize_t fp_get_pollfds(struct fp_pollfd **pollfds)
{
const struct libusb_pollfd **usbfds;
const struct libusb_pollfd *usbfd;
struct fp_pollfd *ret;
size_t cnt = 0;
ssize_t cnt = 0;
size_t i = 0;
usbfds = libusb_get_pollfds(fpi_usb_ctx);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment