Merge remote-tracking branch 'tonokip/master'

compat.h

@@ -47,16 +47,18 @@ static inline int nanosleep(const struct timespec *req, struct timespec *rem)
 }
 #endif
 
-/* Reported unneded in https://github.com/veox/sgminer/issues/37 */
+#if defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR
-/* static inline int sleep(unsigned int secs) */
+// Reported unneded in https://github.com/veox/sgminer/issues/37 */
-/* { */
+static inline int sleep(unsigned int secs)
-/* 	struct timespec req, rem; */
+{
-/* 	req.tv_sec = secs; */
+	struct timespec req, rem;
-/* 	req.tv_nsec = 0; */
+	req.tv_sec = secs;
-/* 	if (!nanosleep(&req, &rem)) */
+	req.tv_nsec = 0;
-/* 		return 0; */
+	if (!nanosleep(&req, &rem))
-/* 	return rem.tv_sec + (rem.tv_nsec ? 1 : 0); */
+		return 0;
-/* } */
+	return rem.tv_sec + (rem.tv_nsec ? 1 : 0);
+}
+#endif
 
 enum {
 	PRIO_PROCESS		= 0,

sgminer.c

@@ -35,6 +35,7 @@
 #ifndef WIN32
 #include <sys/resource.h>
 #else
+#include <winsock2.h> //before windows.h to resolve ws2tcpip.h conflict https://github.com/veox/sgminer/issues/12
 #include <windows.h>
 #endif
 #include <ccan/opt/opt.h>
@@ -3043,7 +3044,7 @@ static void kill_mining(void)
 		if (thr && PTH(thr) != 0L)
 			pth = &thr->pth;
 		thr_info_cancel(thr);
-#ifndef WIN32
+#if !defined WIN32 || defined __MINGW64_VERSION_MAJOR
 		if (pth && *pth)
 			pthread_join(*pth, NULL);
 #else