summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2017-11-06 15:25:34 -0500
committerAdam Jackson <ajax@redhat.com>2017-11-06 17:22:46 -0500
commit2e7f790b5770589ae2f97ee363ecd33fdb362c24 (patch)
tree870a41e5f76f2885f09c92a36608d8e3414c9528 /dix
parent4d15a2645f00995618d8687edf1fb0f4b2316ace (diff)
dix: Remove ffs.c
Your libc has ffs, I promise. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'dix')
-rw-r--r--dix/Makefile.am1
-rw-r--r--dix/ffs.c49
-rw-r--r--dix/meson.build1
3 files changed, 0 insertions, 51 deletions
diff --git a/dix/Makefile.am b/dix/Makefile.am
index a4171d7e1..b96da08f9 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -21,7 +21,6 @@ libdix_la_SOURCES = \
events.c \
eventconvert.c \
extension.c \
- ffs.c \
gc.c \
getevents.c \
globals.c \
diff --git a/dix/ffs.c b/dix/ffs.c
deleted file mode 100644
index f0400cbd1..000000000
--- a/dix/ffs.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-
-Copyright 1996, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL-
-ITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization from
-The Open Group.
-
-*/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef HAVE_FFS
-
-#include "dix.h"
-
-int
-ffs(int i)
-{
- int j;
-
- if (i == 0)
- return 0;
- for (j = 1; (i & 1) == 0; j++)
- i >>= 1;
- return j;
-}
-
-#endif
diff --git a/dix/meson.build b/dix/meson.build
index b3952a361..66bd84d9e 100644
--- a/dix/meson.build
+++ b/dix/meson.build
@@ -11,7 +11,6 @@ srcs_dix = [
'events.c',
'eventconvert.c',
'extension.c',
- 'ffs.c',
'gc.c',
'getevents.c',
'globals.c',