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 373e3147e383c143dc7273253d584f922a421a50..050c98ac530dfc34f267ff9f23cb9bf8db84bbfd 100644 (file)
--- 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;