From:  <shinichiro.hamaji@gmail.com>
Date: Fri, 31 Jul 2009 05:25:27 +0000 (+0000)
Subject: Make the order of check for OS_WINDOWS|OS_CYGWIN and HAVE_PTHREAD consistent.
X-Git-Tag: accepted/tizen/5.0/unified/20181102.024921~166
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e54f5ab1102637dca67feaf63a74bc35dababdd;p=platform%2Fupstream%2Fglog.git

Make the order of check for OS_WINDOWS|OS_CYGWIN and HAVE_PTHREAD consistent.


git-svn-id: https://google-glog.googlecode.com/svn/trunk@70 eb4d4688-79bd-11dd-afb4-1d65580434c0
---

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