fixed cygwin compilation errors

diff --git a/src/googletest.h b/src/googletest.h
index b4677b2..12ea454 100644 (file)
--- a/src/googletest.h
+++ b/src/googletest.h
@@ -521,7 +521,7 @@ class Thread {
   virtual ~Thread() {}
 
   void SetJoinable(bool) {}
-#if defined(OS_WINDOWS) || defined(OS_CYGWIN)
+#if defined(OS_WINDOWS) && !defined(OS_CYGWIN)
   void Start() {
     handle_ = CreateThread(NULL,
                            0,
@@ -554,7 +554,7 @@ class Thread {
     return NULL;
   }
 
-#if defined(OS_WINDOWS) || defined(OS_CYGWIN)
+#if defined(OS_WINDOWS) && !defined(OS_CYGWIN)
   HANDLE handle_;
   DWORD th_;
 #else

diff --git a/src/utilities.cc b/src/utilities.cc
index 5c88e58..133e708 100644 (file)
--- a/src/utilities.cc
+++ b/src/utilities.cc
@@ -266,7 +266,7 @@ pid_t GetTID() {
   // If gettid() could not be used, we use one of the following.
 #if defined OS_LINUX
   return getpid();  // Linux:  getpid returns thread ID when gettid is absent
-#elif defined OS_WINDOWS || defined OS_CYGWIN
+#elif defined OS_WINDOWS && !defined OS_CYGWIN
   return GetCurrentThreadId();
 #else
   // If none of the techniques above worked, we use pthread_self().