Alexandre Julliard : libport: Remove the ffs() function replacement.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c4e45400533f5d361fa56cb372f60c8fee627ef3
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c4e45400533f5d361fa56cb37...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue Dec  1 10:16:59 2020 +0100

libport: Remove the ffs() function replacement.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 configure             |  1 -
 configure.ac          |  1 -
 include/config.h.in   |  3 ---
 include/wine/port.h   |  5 ----
 libs/port/Makefile.in |  1 -
 libs/port/ffs.c       | 64 ---------------------------------------------------
 6 files changed, 75 deletions(-)

diff --git a/configure b/configure
index e6596361ff1..0e3ef007a84 100755
--- a/configure
+++ b/configure
@@ -17754,7 +17754,6 @@ for ac_func in \
         __res_getservers \
 	_spawnvp \
 	epoll_create \
-	ffs \
 	fnmatch \
 	fork \
 	fstatfs \
diff --git a/configure.ac b/configure.ac
index 705ab04295d..2b6ab1543cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2163,7 +2163,6 @@ AC_CHECK_FUNCS(\
         __res_getservers \
 	_spawnvp \
 	epoll_create \
-	ffs \
 	fnmatch \
 	fork \
 	fstatfs \
diff --git a/include/config.h.in b/include/config.h.in
index 7367a5ac8dd..c047fb471b4 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -162,9 +162,6 @@
 /* Define to 1 if you have the <FAudio.h> header file. */
 #undef HAVE_FAUDIO_H
 
-/* Define to 1 if you have the `ffs' function. */
-#undef HAVE_FFS
-
 /* Define to 1 if you have the <float.h> header file. */
 #undef HAVE_FLOAT_H
 
diff --git a/include/wine/port.h b/include/wine/port.h
index 993cf483c15..c963abbd4e0 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -274,10 +274,6 @@ extern int getopt_long_only (int ___argc, char *const *___argv,
                              const struct option *__longopts, int *__longind);
 #endif  /* HAVE_GETOPT_LONG_ONLY */
 
-#ifndef HAVE_FFS
-int ffs( int x );
-#endif
-
 #ifndef HAVE_LSTAT
 int lstat(const char *file_name, struct stat *buf);
 #endif /* HAVE_LSTAT */
@@ -332,7 +328,6 @@ extern int mkstemps(char *template, int suffix_len);
 
 #define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable
 
-#define ffs                     __WINE_NOT_PORTABLE(ffs)
 #define fstatvfs                __WINE_NOT_PORTABLE(fstatvfs)
 #define getopt_long             __WINE_NOT_PORTABLE(getopt_long)
 #define getopt_long_only        __WINE_NOT_PORTABLE(getopt_long_only)
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 435598c2856..7c9c27da1fe 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -1,7 +1,6 @@
 STATICLIB = libwine_port.a
 
 C_SRCS = \
-	ffs.c \
 	fstatvfs.c \
 	getopt.c \
 	isfinite.c \
diff --git a/libs/port/ffs.c b/libs/port/ffs.c
deleted file mode 100644
index 76330559b5a..00000000000
--- a/libs/port/ffs.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * ffs function
- *
- * Copyright 2004 Hans Leidekker
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "config.h"
-#include "wine/port.h"
-
-#ifndef HAVE_FFS
-int ffs( int x )
-{
-    unsigned int y = (unsigned int)x;
-
-    if (y & 0x00000001) return 1;
-    if (y & 0x00000002) return 2;
-    if (y & 0x00000004) return 3;
-    if (y & 0x00000008) return 4;
-    if (y & 0x00000010) return 5;
-    if (y & 0x00000020) return 6;
-    if (y & 0x00000040) return 7;
-    if (y & 0x00000080) return 8;
-    if (y & 0x00000100) return 9;
-    if (y & 0x00000200) return 10;
-    if (y & 0x00000400) return 11;
-    if (y & 0x00000800) return 12;
-    if (y & 0x00001000) return 13;
-    if (y & 0x00002000) return 14;
-    if (y & 0x00004000) return 15;
-    if (y & 0x00008000) return 16;
-    if (y & 0x00010000) return 17;
-    if (y & 0x00020000) return 18;
-    if (y & 0x00040000) return 19;
-    if (y & 0x00080000) return 20;
-    if (y & 0x00100000) return 21;
-    if (y & 0x00200000) return 22;
-    if (y & 0x00400000) return 23;
-    if (y & 0x00800000) return 24;
-    if (y & 0x01000000) return 25;
-    if (y & 0x02000000) return 26;
-    if (y & 0x04000000) return 27;
-    if (y & 0x08000000) return 28;
-    if (y & 0x10000000) return 29;
-    if (y & 0x20000000) return 30;
-    if (y & 0x40000000) return 31;
-    if (y & 0x80000000) return 32;
-
-    return 0;
-}
-#endif /* HAVE_FFS */