diff --git a/src/googletest.h b/src/googletest.h index ca5567e..c1df14e 100644 --- a/src/googletest.h +++ b/src/googletest.h @@ -528,14 +528,7 @@ class Thread { virtual ~Thread() {} void SetJoinable(bool joinable) {} -#if defined(HAVE_PTHREAD) - void Start() { - pthread_create(&th_, NULL, &Thread::InvokeThread, this); - } - void Join() { - pthread_join(th_, NULL); - } -#elif defined(OS_WINDOWS) || defined(OS_CYGWIN) +#if defined(OS_WINDOWS) || defined(OS_CYGWIN) void Start() { handle_ = CreateThread(NULL, 0, @@ -548,6 +541,13 @@ class Thread { void Join() { WaitForSingleObject(handle_, INFINITE); } +#elif defined(HAVE_PTHREAD) + void Start() { + pthread_create(&th_, NULL, &Thread::InvokeThread, this); + } + void Join() { + pthread_join(th_, NULL); + } #else # error No thread implementation. #endif