From cda3f2658389330999ad35390ed2676a7dc37325 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Sun, 6 Mar 2011 17:08:38 +0100
Subject: simplify ffs* code

Remove __libc_ffs*, unneeded

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
---
 libc/string/ffs.c   | 11 ++++-------
 libc/string/ffsll.c | 14 +++++---------
 2 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'libc/string')

diff --git a/libc/string/ffs.c b/libc/string/ffs.c
index 4a5336d47..f39d304b7 100644
--- a/libc/string/ffs.c
+++ b/libc/string/ffs.c
@@ -6,11 +6,9 @@
  */
 
 #include <limits.h>
-#define ffsl __something_else
-#include "_string.h"
-#undef ffsl
+#include <string.h>
   
-int __libc_ffs(int i)
+int ffs(int i)
 {
 #if 1
 	/* inlined binary search method */
@@ -51,8 +49,7 @@ int __libc_ffs(int i)
 	return n;
 #endif
 }
-libc_hidden_def(__libc_ffs)
-weak_alias(__libc_ffs,ffs)
+libc_hidden_def(ffs)
 #if ULONG_MAX == UINT_MAX
-weak_alias (__libc_ffs, ffsl)
+strong_alias_untyped(ffs, ffsl)
 #endif
diff --git a/libc/string/ffsll.c b/libc/string/ffsll.c
index 29e9ba9d9..a7662900b 100644
--- a/libc/string/ffsll.c
+++ b/libc/string/ffsll.c
@@ -18,23 +18,19 @@
    02111-1307 USA.  */
 
 #include <limits.h>
-#define ffsl __something_else
-#include "_string.h"
-#undef ffsl
+#include <string.h>
 
 /* Find the first bit set in I.  */
-int __libc_ffsll (long long int i)
+int ffsll (long long int i)
 {
   unsigned long long int x = i & -i;
 
   if (x <= 0xffffffff)
-    return __libc_ffs (i);
+    return ffs (i);
   else
-    return 32 + __libc_ffs (i >> 32);
+    return 32 + ffs (i >> 32);
 }
-libc_hidden_def(__libc_ffsll)
 
-weak_alias (__libc_ffsll, ffsll)
 #if ULONG_MAX != UINT_MAX
-weak_alias (__libc_ffsll, ffsl)
+strong_alias_untyped(ffsll, ffsl)
 #endif
-- 
cgit v1.2.3