diff options
author | Adam Jackson <ajax@redhat.com> | 2017-11-06 15:25:33 -0500 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2017-11-06 17:22:46 -0500 |
commit | 4d15a2645f00995618d8687edf1fb0f4b2316ace (patch) | |
tree | 522b6a1cc0db3e183ae6ea872e6b7155f02d68eb /os | |
parent | 4b0a3cbab131eb453e2b3fc0337121969258a7be (diff) |
os: Remove mffs()
This was always wide enough to work on an fd_mask ("mask" ffs
presumably). We don't operate on fd_masks anymore, so this can go.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'os')
-rw-r--r-- | os/WaitFor.c | 18 | ||||
-rw-r--r-- | os/osdep.h | 7 |
2 files changed, 0 insertions, 25 deletions
diff --git a/os/WaitFor.c b/os/WaitFor.c index 613608faf..fa6a99b18 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -90,24 +90,6 @@ SOFTWARE. #define GetErrno() errno #endif -/* like ffs, but uses fd_mask instead of int as argument, so it works - when fd_mask is longer than an int, such as common 64-bit platforms */ -/* modifications by raphael */ -int -mffs(fd_mask mask) -{ - int i; - - if (!mask) - return 0; - i = 1; - while (!(mask & 1)) { - i++; - mask >>= 1; - } - return i; -} - #ifdef DPMSExtension #include <X11/extensions/dpmsconst.h> #endif diff --git a/os/osdep.h b/os/osdep.h index 3ab81958c..67958fd77 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -148,13 +148,6 @@ extern Bool NewOutputPending; extern WorkQueuePtr workQueue; -/* in WaitFor.c */ -#if defined(WIN32) && !defined(__CYGWIN__) -typedef long int fd_mask; -#endif -#define ffs mffs -extern int mffs(fd_mask); - /* in access.c */ extern Bool ComputeLocalClient(ClientPtr client); |