Index: extern/libmv/third_party/glog/src/windows/port.h =================================================================== --- extern/libmv/third_party/glog/src/windows/port.h (revision 56513) +++ extern/libmv/third_party/glog/src/windows/port.h (working copy) @@ -93,9 +93,6 @@ #define strcasecmp _stricmp #define strncasecmp _strnicmp -/* In windows-land, hash<> is called hash_compare<> (from xhash.h) */ -#define hash hash_compare - /* Sleep is in ms, on windows */ #define sleep(secs) Sleep((secs) * 1000)