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

This reverts commit 6b95cebfaaf9f6ee862fc790d5a128769dc573bf.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/libringbuffer/backend_internal.h b/libringbuffer/backend_internal.h
index c9ed81be0e5b5c559ba8de23846a6052ecc8ddea..36d53dfd531357037501a539cd8c991c9d2ca4d9 100644 (file)
--- a/libringbuffer/backend_internal.h
+++ b/libringbuffer/backend_internal.h
@@ -436,7 +436,7 @@ do {                                                                \
 
 /* arch-agnostic implementation */
 
-static inline int lttng_ust_fls(unsigned int x)
+static inline int fls(unsigned int x)
 {
        int r = 32;
 
@@ -469,7 +469,7 @@ static inline int get_count_order(unsigned int count)
 {
        int order;
 
-       order = lttng_ust_fls(count) - 1;
+       order = fls(count) - 1;
        if (count & (count - 1))
                order++;
        return order;