projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e965e92
)
Hacky compile fix for mingw compile issue reported by bat3a on bf-committers
author
Joshua Leung <aligorith@gmail.com>
Fri, 22 Jan 2016 00:59:54 +0000
(13:59 +1300)
committer
Joshua Leung <aligorith@gmail.com>
Fri, 22 Jan 2016 00:59:54 +0000
(13:59 +1300)
I've been using this fix in another branch locally, so it seems to work fine.
The other #ifdef checks should be checked on too, as __MINGW32__ and __MINGW64__
do NOT seem to be defined when compiling that file
extern/glog/src/windows/port.h
patch
|
blob
|
history
diff --git
a/extern/glog/src/windows/port.h
b/extern/glog/src/windows/port.h
index d78a1854f46af6e6b78eedb1a7650164b530f48e..02c6f6e77b22897549440f7ff4a34f7538249d95 100644
(file)
--- a/
extern/glog/src/windows/port.h
+++ b/
extern/glog/src/windows/port.h
@@
-149,8
+149,13
@@
inline struct tm* localtime_r(const time_t* timep, struct tm* result) {
}
inline char* strerror_r(int errnum, char* buf, size_t buflen) {
+#ifdef FREE_WINDOWS
+ strncpy(buf, "Not implemented yet", buflen);
+ return buf;
+#else
strerror_s(buf, buflen, errnum);
return buf;
+#endif
}
#ifndef __cplusplus