commit 262a4a0c4ba340e863c7e693672156ff2fee0715
author Torne (Richard Coles) <torne@google.com> Wed May 15 11:35:21 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Wed May 15 11:35:21 2013 +0100
tree 1ed37aaabc0b287307c068763ceaf4f0a16c250b
parent 45016e61d06118f11ead22328c02ffbe5e14011e
parent 0e46fd16cd9df40ec0ba9b450d905cef75961918

Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I2afcdc01d55e6ea26ef1e5786baa671efae8164f

MurmurHash3.cpp

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 )
 {

Platform.h

diff --git a/Platform.h b/Platform.h
index 8de26be..6d0f0df 100644
--- a/Platform.h
+++ b/Platform.h
@@ -40,7 +40,7 @@
 
 #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 )