提交 32b2e5a8 编写于 作者: E Eric Blake

build: avoid gcc 4.7 warning about inlines

gcc 4.7 complains:

util/virhashcode.c:49:17: error: always_inline function might not be inlinable [-Werror=attributes]
util/virhashcode.c:35:17: error: always_inline function might not be inlinable [-Werror=attributes]

Normal 'inline' is a hint that the compiler may ignore; the fact
that the function is static is good enough.  We don't care if the
compiler decided not to inline after all.

* src/util/virhashcode.c (getblock, fmix): Relax attribute.
上级 10cc08ee
......@@ -31,8 +31,7 @@
#include "bitrotate.h"
/* slower than original but handles platforms that do only aligned reads */
__attribute__((always_inline))
static uint32_t getblock(const uint8_t *p, int i)
static inline uint32_t getblock(const uint8_t *p, int i)
{
uint32_t r;
size_t size = sizeof(r);
......@@ -45,8 +44,7 @@ static uint32_t getblock(const uint8_t *p, int i)
/*
* Finalization mix - force all bits of a hash block to avalanche
*/
__attribute__((always_inline))
static uint32_t fmix(uint32_t h)
static inline uint32_t fmix(uint32_t h)
{
h ^= h >> 16;
h *= 0x85ebca6b;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册