luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #157 from sergiud/cygwin-support

Browse Source 
Cygwin support
This commit is contained in:
Shinichiro Hamaji 2017-07-06 15:00:06 +09:00 committed by GitHub
commit a808e435b7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/googletest.h
View File

@ -521,7 +521,7 @@ class Thread {
virtual ~Thread() {} virtual ~Thread() {}
void SetJoinable(bool) {} void SetJoinable(bool) {}
#if defined(OS_WINDOWS) || defined(OS_CYGWIN) #if defined(OS_WINDOWS) && !defined(OS_CYGWIN)
void Start() { void Start() {
handle_ = CreateThread(NULL, handle_ = CreateThread(NULL,
0, 0,
@ -554,7 +554,7 @@ class Thread {
return NULL; return NULL;
} }
#if defined(OS_WINDOWS) || defined(OS_CYGWIN) #if defined(OS_WINDOWS) && !defined(OS_CYGWIN)
HANDLE handle_; HANDLE handle_;
DWORD th_; DWORD th_;
#else #else

2
src/utilities.cc
View File

@ -268,7 +268,7 @@ pid_t GetTID() {
// If gettid() could not be used, we use one of the following. // If gettid() could not be used, we use one of the following.
#if defined OS_LINUX #if defined OS_LINUX
return getpid(); // Linux: getpid returns thread ID when gettid is absent 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(); return GetCurrentThreadId();
#else #else
// If none of the techniques above worked, we use pthread_self(). // If none of the techniques above worked, we use pthread_self().