Merge pull request #132 from sergiud/cmake-disable-unittests
cmake: allow to disable building unit tests
diff --git a/AUTHORS b/AUTHORS
index 8454413..347ae24 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,10 +10,12 @@
Abhishek Dasgupta <abhi2743@gmail.com>
Abhishek Parmar <abhishek@orng.net>
+Andy Ying <andy@trailofbits.com>
Brian Silverman <bsilver16384@gmail.com>
Google Inc.
Guillaume Dumont <dumont.guillaume@gmail.com>
Michael Tanner <michael@tannertaxpro.com>
+MiniLight <MiniLightAR@Gmail.com>
romange <romange@users.noreply.github.com>
Sergiu Dotenco <sergiu.dotenco@th-nuernberg.de>
tbennun <tbennun@gmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 20e9805..40864c1 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -24,12 +24,14 @@
Abhishek Dasgupta <abhi2743@gmail.com>
Abhishek Parmar <abhishek@orng.net>
+Andy Ying <andy@trailofbits.com>
Brian Silverman <bsilver16384@gmail.com>
Fumitoshi Ukai <ukai@google.com>
Guillaume Dumont <dumont.guillaume@gmail.com>
Håkan L. S. Younes <hyounes@google.com>
Ivan Penkov <ivanpe@google.com>
Michael Tanner <michael@tannertaxpro.com>
+MiniLight <MiniLightAR@Gmail.com>
Peter Collingbourne <pcc@google.com>
romange <romange@users.noreply.github.com>
Sergiu Dotenco <sergiu.dotenco@th-nuernberg.de>
diff --git a/src/logging.cc b/src/logging.cc
index ec9eef1..0b5e6ee 100644
--- a/src/logging.cc
+++ b/src/logging.cc
@@ -825,6 +825,7 @@
}
MutexLock l(&sink_mutex_);
delete sinks_;
+ sinks_ = NULL;
}
namespace {
diff --git a/src/windows/port.h b/src/windows/port.h
index d78a185..8198461 100755
--- a/src/windows/port.h
+++ b/src/windows/port.h
@@ -136,6 +136,7 @@
#endif // _MSC_VER
// ----------------------------------- THREADS
+#ifndef __MINGW32__
typedef DWORD pthread_t;
typedef DWORD pthread_key_t;
typedef LONG pthread_once_t;
@@ -147,6 +148,7 @@
localtime_s(result, timep);
return result;
}
+#endif
inline char* strerror_r(int errnum, char* buf, size_t buflen) {
strerror_s(buf, buflen, errnum);
