Windows: Move definitions for Cygwin.

Closes #145

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

diff --git a/libusb/os/windows_common.h b/libusb/os/windows_common.h
index 0149e11bf2152496284450cf191c30fd2982b646..17a192372364a33794c66776fbca398e89a85116 100644 (file)
--- a/libusb/os/windows_common.h
+++ b/libusb/os/windows_common.h
@@ -37,6 +37,14 @@
 #define false FALSE
 #endif
 
+#if defined(__CYGWIN__ )
+#define _stricmp strcasecmp
+#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, (LPDWORD)f)
+#endif
+
 #define safe_free(p) do {if (p != NULL) {free((void*)p); p = NULL;}} while(0)
 #define safe_closehandle(h) do {if (h != INVALID_HANDLE_VALUE) {CloseHandle(h); h = INVALID_HANDLE_VALUE;}} while(0)
 #define safe_min(a, b) MIN((size_t)(a), (size_t)(b))

diff --git a/libusb/os/windows_winusb.h b/libusb/os/windows_winusb.h
index 047f2e269c5cc39f933418573c5894a52b64fd47..d544a7f9eb9a80fa144c233e4704ef42485f3cce 100644 (file)
--- a/libusb/os/windows_winusb.h
+++ b/libusb/os/windows_winusb.h
@@ -48,14 +48,6 @@
 #define FACILITY_SETUPAPI      15
 #endif
 
-#if defined(__CYGWIN__ )
-#define _stricmp strcasecmp
-#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, (LPDWORD)f)
-#endif
-
 #define MAX_CTRL_BUFFER_LENGTH 4096
 #define MAX_USB_DEVICES                256
 #define MAX_USB_STRING_LENGTH  128

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index ff9977abe7a50654f4098e3f584bbe6456dabf9a..b5eb186913671a412e0192aae87ec170504ec1a3 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11047
+#define LIBUSB_NANO 11048