summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMiniLight <MiniLightAR@Gmail.com>2016-10-02 16:38:15 (GMT)
committerMiniLight <MiniLightAR@Gmail.com>2016-10-03 00:00:09 (GMT)
commit9c584dd2ede5c37ef45f180121b7c6f29a295502 (patch)
tree2ad6035063a10978319a573625be0dec4cc19292 /src
parent0472b91c5defdf90cff7292e3bf7bd86770a9a0a (diff)
downloadglog-9c584dd2ede5c37ef45f180121b7c6f29a295502.zip
glog-9c584dd2ede5c37ef45f180121b7c6f29a295502.tar.gz
glog-9c584dd2ede5c37ef45f180121b7c6f29a295502.tar.bz2
try to avoid the error "conflicting declaration 'typedef DWORD
pthread_t'" etc.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/windows/port.h2
1 files changed, 2 insertions, 0 deletions
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 @@ typedef int pid_t;
#endif // _MSC_VER
// ----------------------------------- THREADS
+#ifndef __MINGW32__
typedef DWORD pthread_t;
typedef DWORD pthread_key_t;
typedef LONG pthread_once_t;
@@ -147,6 +148,7 @@ inline struct tm* localtime_r(const time_t* timep, struct tm* result) {
localtime_s(result, timep);
return result;
}
+#endif
inline char* strerror_r(int errnum, char* buf, size_t buflen) {
strerror_s(buf, buflen, errnum);