From a57f841570e62b754fd8acc142448068eba01ad6 Mon Sep 17 00:00:00 2001 From: Noel Maersk Date: Sat, 29 Mar 2014 03:04:18 +0200 Subject: [PATCH] Revert "fix for mingw-w64" This reverts commit 32b13ccb46eb2607c5fd40052318fcdbd8d32dca. Reported by Wolf0 (aka wolf9466) to not break MinGW 64-bit compilation with GCC 4.8.2 (latest stable). --- sgminer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgminer.c b/sgminer.c index b9448e15..3b053e93 100644 --- a/sgminer.c +++ b/sgminer.c @@ -3138,7 +3138,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) +#ifndef WIN32 if (pth && *pth) pthread_join(*pth, NULL); #else