[Spice-devel] [xf86-video-qxl warnings 5/6] Actually request the forcibly inline functions to be inline.

Jeremy White jwhite at codeweavers.com
Thu Mar 21 09:23:29 PDT 2013


Silences a gcc warning (-Wattributes).

Signed-off-by: Jeremy White <jwhite at codeweavers.com>
---
 src/murmurhash3.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/murmurhash3.c b/src/murmurhash3.c
index afb7d7d..0df34a7 100644
--- a/src/murmurhash3.c
+++ b/src/murmurhash3.c
@@ -52,12 +52,12 @@ static inline uint64_t rotl64 ( uint64_t x, int8_t r )
 // Block read - if your platform needs to do endian-swapping or can only
 // handle aligned reads, do the conversion here
 
-static FORCE_INLINE uint32_t getblock_32 ( const uint32_t * p, int i )
+inline static FORCE_INLINE uint32_t getblock_32 ( const uint32_t * p, int i )
 {
   return p[i];
 }
 
-static FORCE_INLINE uint64_t getblock_64 ( const uint64_t * p, int i )
+inline static FORCE_INLINE uint64_t getblock_64 ( const uint64_t * p, int i )
 {
   return p[i];
 }
@@ -65,7 +65,7 @@ static FORCE_INLINE uint64_t getblock_64 ( const uint64_t * p, int i )
 //-----------------------------------------------------------------------------
 // Finalization mix - force all bits of a hash block to avalanche
 
-static FORCE_INLINE uint32_t fmix_32 ( uint32_t h )
+inline static FORCE_INLINE uint32_t fmix_32 ( uint32_t h )
 {
   h ^= h >> 16;
   h *= 0x85ebca6b;
@@ -78,7 +78,7 @@ static FORCE_INLINE uint32_t fmix_32 ( uint32_t h )
 
 //----------
 
-static FORCE_INLINE uint64_t fmix_64 ( uint64_t k )
+inline static FORCE_INLINE uint64_t fmix_64 ( uint64_t k )
 {
   k ^= k >> 33;
   k *= BIG_CONSTANT(0xff51afd7ed558ccd);
-- 
1.7.10.4





More information about the Spice-devel mailing list