xserver: Branch 'master'

[Julien Cristau]

 configure.ac            |    2 +-
 dix/ffs.c               |    4 ++++
 include/dix-config.h.in |    3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ab17f88506a2dde32c50ff72b03743cd9c384ecc
Author: Julien Cristau <jcristau at debian.org>
Date:   Mon Sep 22 01:59:31 2008 +0200

    Don't use our version of ffs() if the system has one

diff --git a/configure.ac b/configure.ac
index 95fa73a..60cdc14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,7 +180,7 @@ dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr \
 		strtol getopt getopt_long vsnprintf walkcontext backtrace \
-		getisax getzoneid shmctl64 strcasestr])
+		getisax getzoneid shmctl64 strcasestr ffs])
 AC_FUNC_ALLOCA
 dnl Old HAS_* names used in os/*.c.
 AC_CHECK_FUNC([getdtablesize],
diff --git a/dix/ffs.c b/dix/ffs.c
index b75657d..d0bd3e5 100644
--- a/dix/ffs.c
+++ b/dix/ffs.c
@@ -30,6 +30,8 @@ The Open Group.
 #include <dix-config.h>
 #endif
 
+#ifndef HAVE_FFS
+
 #include "dix.h"
 
 int
@@ -42,3 +44,5 @@ ffs(int i)
 	i >>= 1;
     return j;
 }
+
+#endif
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 21d8d9c..06138c5 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -433,4 +433,7 @@
 /* Need the strcasestr function. */
 #undef NEED_STRCASESTR
 
+/* Define to 1 if you have the `ffs' function. */
+#undef HAVE_FFS
+
 #endif /* _DIX_CONFIG_H_ */