From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 21 Feb 2012 00:17:08 +0000 (-0500)
Subject: fls: use local namespace to do not clash with FreeBSD string.h
X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=commitdiff_plain;h=3241c2d2a8bdeeeaebdfbb877bf7b8517d471c1a

fls: use local namespace to do not clash with FreeBSD string.h

commit bfd265823dd6c3b272b92c6e39456e851bfd51ce upstream.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
---

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;