diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-11 17:10:39 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-11 17:10:39 +0400 |
| commit | 309db8032c014e3915736482bc2689199d116cc7 (patch) | |
| tree | ae87c050cf71df82a42fad6411825693d5667f1a /extern | |
| parent | f35a9328e000ea26c7ab08a7386c45645a106158 (diff) | |
Fix libmv build with visual studio 2012.
Patch #35158 by Jurgen Herrmann.
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) |