projects
/
platform
/
upstream
/
glog.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0472b91
)
try to avoid the error "conflicting declaration 'typedef DWORD
author
MiniLight
<MiniLightAR@Gmail.com>
Sun, 2 Oct 2016 16:38:15 +0000
(
00:38
+0800)
committer
MiniLight
<MiniLightAR@Gmail.com>
Mon, 3 Oct 2016 00:00:09 +0000
(08:00 +0800)
pthread_t'" etc.
src/windows/port.h
patch
|
blob
|
history
diff --git
a/src/windows/port.h
b/src/windows/port.h
index
d78a185
..
8198461
100755
(executable)
--- 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);