From: Willy Tarreau <w@1wt.eu>
Date: Sat, 12 Aug 2023 17:58:17 +0000 (+0200)
Subject: BUILD: pools: fix build error on clang with inline vs forceinline
X-Git-Tag: v2.9-dev3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d18717fb808441e3214cc50409fe358ea67497c;p=thirdparty%2Fhaproxy.git

BUILD: pools: fix build error on clang with inline vs forceinline

clang is more picky than gcc regarding duplicate "inline". The functions
declared with "forceinline" don't need to have "inline" since it's already
in the macro.
---

diff --git a/src/pool.c b/src/pool.c
index 7cb71d00fc..341c3b4d86 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -115,7 +115,7 @@ static int(*_malloc_trim)(size_t) = NULL;
  * allocated on one thread and released on another one. Thus only the
  * pointer is usable.
  */
-static inline forceinline unsigned int pool_pbucket(const void *ptr)
+static forceinline unsigned int pool_pbucket(const void *ptr)
 {
 	return ptr_hash(ptr, CONFIG_HAP_POOL_BUCKETS_BITS);
 }
@@ -123,7 +123,7 @@ static inline forceinline unsigned int pool_pbucket(const void *ptr)
 /* returns the pool hash bucket to use for the current thread. This should only
  * be used when no pointer is available (e.g. count alloc failures).
  */
-static inline forceinline unsigned int pool_tbucket(void)
+static forceinline unsigned int pool_tbucket(void)
 {
 	return tid % CONFIG_HAP_POOL_BUCKETS;
 }