summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFumitoshi Ukai <fumitoshi.ukai@gmail.com>2016-10-19 07:29:34 (GMT)
committerGitHub <noreply@github.com>2016-10-19 07:29:34 (GMT)
commitcf36dabd8e24469c1b16748711f38c0d08085b36 (patch)
tree588570aa560e3e2c61e0fb99d77c72d99d0bacc6 /src
parent5080258031dea5dd1037816d8fee396dcd6a7ae5 (diff)
parent9c584dd2ede5c37ef45f180121b7c6f29a295502 (diff)
downloadglog-cf36dabd8e24469c1b16748711f38c0d08085b36.zip
glog-cf36dabd8e24469c1b16748711f38c0d08085b36.tar.gz
glog-cf36dabd8e24469c1b16748711f38c0d08085b36.tar.bz2
Merge pull request #127 from MinGW-caffe/master
try to avoid the error "conflicting declaration 'typedef DWORD pthread_t'" etc. in MinGW
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);