Skip to content

G
glog
Commit 9c584dd2 authored by MiniLight's avatar MiniLight
Browse files
Options

try to avoid the error "conflicting declaration 'typedef DWORD 

pthread_t'" etc.
parent 0472b91c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
src/windows/port.h
View file @ 9c584dd2
...@@ -136,6 +136,7 @@ typedef int pid_t; ...@@ -136,6 +136,7 @@ typedef int pid_t;
#endif // _MSC_VER #endif // _MSC_VER
// ----------------------------------- THREADS // ----------------------------------- THREADS
#ifndef __MINGW32__
typedef DWORD pthread_t; typedef DWORD pthread_t;
typedef DWORD pthread_key_t; typedef DWORD pthread_key_t;
typedef LONG pthread_once_t; typedef LONG pthread_once_t;
...@@ -147,6 +148,7 @@ inline struct tm* localtime_r(const time_t* timep, struct tm* result) { ...@@ -147,6 +148,7 @@ inline struct tm* localtime_r(const time_t* timep, struct tm* result) {
localtime_s(result, timep); localtime_s(result, timep);
return result; return result;
} }
#endif
inline char* strerror_r(int errnum, char* buf, size_t buflen) { inline char* strerror_r(int errnum, char* buf, size_t buflen) {
strerror_s(buf, buflen, errnum); 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