diff options
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/third_party/glog/src/windows/port.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extern/libmv/third_party/glog/src/windows/port.h b/extern/libmv/third_party/glog/src/windows/port.h index 72e3906f82f..09cfe3f1b28 100644 --- a/extern/libmv/third_party/glog/src/windows/port.h +++ b/extern/libmv/third_party/glog/src/windows/port.h @@ -94,7 +94,10 @@ enum { STDIN_FILENO = 0, STDOUT_FILENO = 1, STDERR_FILENO = 2 }; #define strncasecmp _strnicmp /* In windows-land, hash<> is called hash_compare<> (from xhash.h) */ -#define hash hash_compare +/* VC11 provides std::hash */ +#if defined(_MSC_VER) && (_MSC_VER < 1700) +#define hash hash_compare +#endif /* Sleep is in ms, on windows */ #define sleep(secs) Sleep((secs) * 1000) |