From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 22 Feb 2012 22:10:33 +0000 (-0500)
Subject: Revert "fls: use local namespace to do not clash with FreeBSD string.h"
X-Git-Tag: v2.0.0-rc2~20
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=090f55d9ec976938e250346661c384fd163349fe;p=lttng-ust.git

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 c9ed81be..36d53dfd 100644
--- 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;