Index: extern/libmv/third_party/glog/src/windows/port.h =================================================================== --- extern/libmv/third_party/glog/src/windows/port.h (revision 56405) +++ extern/libmv/third_party/glog/src/windows/port.h (working copy) @@ -94,7 +94,9 @@ #define strncasecmp _strnicmp - /* In windows-land, hash<> is called hash_compare<> (from xhash.h) */ + /* In windows-land pre VC2012, hash<> is called hash_compare<> (from xhash.h) */ +#if _MSC_VER < 1700 #define hash hash_compare +#endif /* Sleep is in ms, on windows */ #define sleep(secs) Sleep((secs) * 1000)