diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-01-16 01:20:45 +0000 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-01-16 01:20:45 +0000 |
| commit | a93cef02ffdb72500dab6037ca542d8ef24504e4 (patch) | |
| tree | 9dac650138d65ce84c9c549ee8e9973b163c3a9b /libusb/libusb.h | |
| parent | 12e3f9c159f83365309ebf7885adbb0ae31a81d6 (diff) | |
| download | libusb-a93cef02ffdb72500dab6037ca542d8ef24504e4.tar.gz | |
r85: fixed MSVC warnings for x64 and reverted ssize_t to int for libusb_get_device_list change introduced with r52. Added definition on ssize_t in libusb.h for MSVC platforms.
Diffstat (limited to 'libusb/libusb.h')
| -rw-r--r-- | libusb/libusb.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libusb/libusb.h b/libusb/libusb.h index 8caa3e2..6456652 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -40,6 +40,15 @@ #define interface usb_interface #endif +// Windows doesn't know ssize_t +#if !defined(ssize_t) +#if defined (_WIN64) +#define ssize_t __int64 +#else +#define ssize_t long +#endif +#endif + #ifdef __cplusplus extern "C" { #endif @@ -782,7 +791,7 @@ int libusb_init(libusb_context **ctx); void libusb_exit(libusb_context *ctx); void libusb_set_debug(libusb_context *ctx, int level); -int libusb_get_device_list(libusb_context *ctx, +ssize_t libusb_get_device_list(libusb_context *ctx, libusb_device ***list); void libusb_free_device_list(libusb_device **list, int unref_devices); libusb_device *libusb_ref_device(libusb_device *dev); |