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>
This commit is contained in:
parent
4d15a2645f
commit
2e7f790b57
|
@ -154,7 +154,7 @@ AC_CHECK_FUNC([dlopen], [],
|
||||||
AC_SUBST(DLOPEN_LIBS)
|
AC_SUBST(DLOPEN_LIBS)
|
||||||
|
|
||||||
dnl Checks for library functions.
|
dnl Checks for library functions.
|
||||||
AC_CHECK_FUNCS([backtrace ffs geteuid getuid issetugid getresuid \
|
AC_CHECK_FUNCS([backtrace geteuid getuid issetugid getresuid \
|
||||||
getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \
|
getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \
|
||||||
mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \
|
mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \
|
||||||
walkcontext setitimer poll epoll_create1])
|
walkcontext setitimer poll epoll_create1])
|
||||||
|
|
|
@ -21,7 +21,6 @@ libdix_la_SOURCES = \
|
||||||
events.c \
|
events.c \
|
||||||
eventconvert.c \
|
eventconvert.c \
|
||||||
extension.c \
|
extension.c \
|
||||||
ffs.c \
|
|
||||||
gc.c \
|
gc.c \
|
||||||
getevents.c \
|
getevents.c \
|
||||||
globals.c \
|
globals.c \
|
||||||
|
|
49
dix/ffs.c
49
dix/ffs.c
|
@ -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
|
|
|
@ -11,7 +11,6 @@ srcs_dix = [
|
||||||
'events.c',
|
'events.c',
|
||||||
'eventconvert.c',
|
'eventconvert.c',
|
||||||
'extension.c',
|
'extension.c',
|
||||||
'ffs.c',
|
|
||||||
'gc.c',
|
'gc.c',
|
||||||
'getevents.c',
|
'getevents.c',
|
||||||
'globals.c',
|
'globals.c',
|
||||||
|
|
|
@ -86,9 +86,6 @@
|
||||||
/* Define to 1 if you have the <fcntl.h> header file. */
|
/* Define to 1 if you have the <fcntl.h> header file. */
|
||||||
#undef HAVE_FCNTL_H
|
#undef HAVE_FCNTL_H
|
||||||
|
|
||||||
/* Define to 1 if you have the `ffs' function. */
|
|
||||||
#undef HAVE_FFS
|
|
||||||
|
|
||||||
/* Define to 1 if you have the `getdtablesize' function. */
|
/* Define to 1 if you have the `getdtablesize' function. */
|
||||||
#undef HAVE_GETDTABLESIZE
|
#undef HAVE_GETDTABLESIZE
|
||||||
|
|
||||||
|
|
|
@ -557,11 +557,6 @@ extern _X_EXPORT void
|
||||||
ScreenRestructured(ScreenPtr pScreen);
|
ScreenRestructured(ScreenPtr pScreen);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef HAVE_FFS
|
|
||||||
extern _X_EXPORT int
|
|
||||||
ffs(int i);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ServerGrabCallback stuff
|
* ServerGrabCallback stuff
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -113,7 +113,6 @@ conf_data.set('HAVE_ARC4RANDOM_BUF', cc.has_function('arc4random_buf', dependenc
|
||||||
conf_data.set('HAVE_BACKTRACE', cc.has_function('backtrace'))
|
conf_data.set('HAVE_BACKTRACE', cc.has_function('backtrace'))
|
||||||
conf_data.set('HAVE_CBRT', cc.has_function('cbrt'))
|
conf_data.set('HAVE_CBRT', cc.has_function('cbrt'))
|
||||||
conf_data.set('HAVE_EPOLL_CREATE1', cc.has_function('epoll_create1'))
|
conf_data.set('HAVE_EPOLL_CREATE1', cc.has_function('epoll_create1'))
|
||||||
conf_data.set('HAVE_FFS', cc.has_function('ffs'))
|
|
||||||
conf_data.set('HAVE_GETUID', cc.has_function('getuid'))
|
conf_data.set('HAVE_GETUID', cc.has_function('getuid'))
|
||||||
conf_data.set('HAVE_GETEUID', cc.has_function('geteuid'))
|
conf_data.set('HAVE_GETEUID', cc.has_function('geteuid'))
|
||||||
conf_data.set('HAVE_ISSETUGID', cc.has_function('issetugid'))
|
conf_data.set('HAVE_ISSETUGID', cc.has_function('issetugid'))
|
||||||
|
|
|
@ -44,9 +44,6 @@
|
||||||
/* Support SHM */
|
/* Support SHM */
|
||||||
#undef HAS_SHM
|
#undef HAS_SHM
|
||||||
|
|
||||||
/* Define to 1 if you have the `ffs' function. */
|
|
||||||
#undef HAVE_FFS
|
|
||||||
|
|
||||||
/* Define to 1 if you have the `reallocarray' function. */
|
/* Define to 1 if you have the `reallocarray' function. */
|
||||||
#undef HAVE_REALLOCARRAY
|
#undef HAVE_REALLOCARRAY
|
||||||
|
|
||||||
|
|
|
@ -62,10 +62,6 @@ SOFTWARE.
|
||||||
#include <X11/Xmd.h>
|
#include <X11/Xmd.h>
|
||||||
#include "servermd.h"
|
#include "servermd.h"
|
||||||
|
|
||||||
#ifndef HAVE_FFS
|
|
||||||
extern int ffs(int);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* MICOPYAREA -- public entry for the CopyArea request
|
/* MICOPYAREA -- public entry for the CopyArea request
|
||||||
* For each rectangle in the source region
|
* For each rectangle in the source region
|
||||||
* get the pixels with GetSpans
|
* get the pixels with GetSpans
|
||||||
|
|
Loading…
Reference in New Issue
Block a user