summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Batard <pete@akeo.ie>2014-11-06 00:50:01 +0000
committerPete Batard <pete@akeo.ie>2014-11-06 00:50:01 +0000
commitab8f71c03f8334df7b88a725a730d2020f2e9f80 (patch)
treea5c7c1713d65034bcbc4d7454f79d7fbb917c09f
parenta447fa4cd517e5393c0f1504b1a35b095aafa334 (diff)
downloadlibusb-ab8f71c03f8334df7b88a725a730d2020f2e9f80.tar.gz
Windows: Fix cygwin64 build
* Issue reported by Thejus
-rw-r--r--libusb/os/windows_usb.h5
-rw-r--r--libusb/version_nano.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/libusb/os/windows_usb.h b/libusb/os/windows_usb.h
index 413adfc..a36419e 100644
--- a/libusb/os/windows_usb.h
+++ b/libusb/os/windows_usb.h
@@ -47,9 +47,8 @@
#if defined(__CYGWIN__ )
#define _stricmp stricmp
-// cygwin produces a warning unless these prototypes are defined
-extern int _snprintf(char *buffer, size_t count, const char *format, ...);
-extern char *_strdup(const char *strSource);
+#define _snprintf snprintf
+#define _strdup strdup
// _beginthreadex is MSVCRT => unavailable for cygwin. Fallback to using CreateThread
#define _beginthreadex(a, b, c, d, e, f) CreateThread(a, b, (LPTHREAD_START_ROUTINE)c, d, e, f)
#endif
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 5cc4a52..1318c5e 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10920
+#define LIBUSB_NANO 10921