aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/ffs.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 20:12:58 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 20:12:58 +0000
commit2553bdd7c359cd87525d367761c86932cec5adff (patch)
treeae71245933c98474a699d3e392de5820879b2018 /xorg-server/dix/ffs.c
parente2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff)
parent4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff)
downloadvcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz
vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2
vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/dix/ffs.c')
-rw-r--r--xorg-server/dix/ffs.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/dix/ffs.c b/xorg-server/dix/ffs.c
index b75657d29..d0bd3e507 100644
--- a/xorg-server/dix/ffs.c
+++ b/xorg-server/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