diff --git a/AUTHORS.md b/AUTHORS.md index b0a16773..eab367fe 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -25,6 +25,7 @@ updated by many others. * Benjamin Herrenschmidt * Joe4782 * gacheson +* tonobitc ...and many others. See: diff --git a/compat.h b/compat.h index 29ae551c..468508ef 100644 --- a/compat.h +++ b/compat.h @@ -47,7 +47,7 @@ static inline int nanosleep(const struct timespec *req, struct timespec *rem) } #endif -#if defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR +#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) // Reported unneded in https://github.com/veox/sgminer/issues/37 */ static inline int sleep(unsigned int secs) { diff --git a/sgminer.c b/sgminer.c index c2063e70..e0ad5e89 100644 --- a/sgminer.c +++ b/sgminer.c @@ -35,7 +35,7 @@ #ifndef WIN32 #include #else -#include //before windows.h to resolve ws2tcpip.h conflict https://github.com/veox/sgminer/issues/12 +#include #include #endif #include @@ -3044,7 +3044,7 @@ static void kill_mining(void) if (thr && PTH(thr) != 0L) pth = &thr->pth; thr_info_cancel(thr); -#if !defined WIN32 || defined __MINGW64_VERSION_MAJOR +#if !defined(WIN32) || defined(__MINGW64_VERSION_MAJOR) if (pth && *pth) pthread_join(*pth, NULL); #else