From 3241c2d2a8bdeeeaebdfbb877bf7b8517d471c1a Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 20 Feb 2012 19:17:08 -0500 Subject: [PATCH] fls: use local namespace to do not clash with FreeBSD string.h commit bfd265823dd6c3b272b92c6e39456e851bfd51ce upstream. Signed-off-by: Mathieu Desnoyers Signed-off-by: Christian Babeux --- libringbuffer/backend_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libringbuffer/backend_internal.h b/libringbuffer/backend_internal.h index 373e3147..050c98ac 100644 --- a/libringbuffer/backend_internal.h +++ b/libringbuffer/backend_internal.h @@ -448,7 +448,7 @@ do { \ /* arch-agnostic implementation */ -static inline int fls(unsigned int x) +static inline int lttng_ust_fls(unsigned int x) { int r = 32; @@ -481,7 +481,7 @@ static inline int get_count_order(unsigned int count) { int order; - order = fls(count) - 1; + order = lttng_ust_fls(count) - 1; if (count & (count - 1)) order++; return order; -- 2.34.1