Commit cf36dabd authored by Fumitoshi Ukai's avatar Fumitoshi Ukai Committed by GitHub

Merge pull request #127 from MinGW-caffe/master

try to avoid the error "conflicting declaration 'typedef DWORD pthread_t'" etc. in MinGW
parents 50802580 9c584dd2
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment