commit b52816cce35fbfdda7d56c533cf53d15201513e3
author aappleby@google.com <aappleby@google.com@77a7d1d3-4c08-bdc2-d393-d5859734b01a> Mon Dec 30 21:23:01 2013 +0000
committer aappleby@google.com <aappleby@google.com@77a7d1d3-4c08-bdc2-d393-d5859734b01a> Mon Dec 30 21:23:01 2013 +0000
tree a65df16f8a7db7db0e018fb19d990a932dd44e4f
parent 5b8fd3c31a58b87b80605dca7a64fad6cb3f8a0f

Merge patch to fix build under VS2010



git-svn-id: http://smhasher.googlecode.com/svn/trunk@151 77a7d1d3-4c08-bdc2-d393-d5859734b01a

MurmurHash1.h

diff --git a/MurmurHash1.h b/MurmurHash1.h
index 93b08c3..24e1ad3 100644
--- a/MurmurHash1.h
+++ b/MurmurHash1.h
@@ -10,10 +10,10 @@
 
 // Microsoft Visual Studio
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
 
 typedef unsigned char uint8_t;
-typedef unsigned long uint32_t;
+typedef unsigned int uint32_t;
 typedef unsigned __int64 uint64_t;
 
 // Other compilers