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

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

Browse Source 
git-svn-id: https://google-glog.googlecode.com/svn/trunk@70 eb4d4688-79bd-11dd-afb4-1d65580434c0
This commit is contained in:
2009-07-31 05:25:27 +00:00
parent 1b5a90b691
commit 7e54f5ab11
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/googletest.h
View File

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