Merge third_party/smhasher/src from https://chromium.googlesource.com/external/smhasher.git at 6f63a4882e6b2cf87e8eec1a3ef8644e0d963283

This commit was generated by merge_from_chromium.py.

Change-Id: Iad27471ee24ed16659190bc72ebb1f10748a990c

2 files changed, 2 insertions, 2 deletions

diff --git a/MurmurHash3.cpp b/MurmurHash3.cpp
index 302e974..5a55b7a 100644
--- a/MurmurHash3.cpp
+++ b/MurmurHash3.cpp
@@ -29,7 +29,7 @@
 
 #else	// defined(_MSC_VER)
 
-#define	FORCE_INLINE __attribute__((always_inline))
+#define	FORCE_INLINE inline __attribute__((always_inline))
 
 inline uint32_t rotl32 ( uint32_t x, int8_t r )
 {
diff --git a/Platform.h b/Platform.h
index 8de26be..6d0f0df 100644
--- a/Platform.h
+++ b/Platform.h
@@ -40,7 +40,7 @@ void SetAffinity ( int cpu );
 
 #include <stdint.h>
 
-#define	FORCE_INLINE __attribute__((always_inline))
+#define	FORCE_INLINE inline __attribute__((always_inline))
 #define	NEVER_INLINE __attribute__((noinline))
 
 inline uint32_t rotl32 ( uint32_t x, int8_t r )