diff options
author | marha <marha@users.sourceforge.net> | 2011-12-08 09:32:47 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-12-08 09:32:47 +0100 |
commit | acd000667561cb9978ead7f14d4fbb97c1a8e727 (patch) | |
tree | 21668e5efeb08af34de6c679d4c46cc6fe5d7b64 /xorg-server/include/dix.h | |
parent | 893624a6c15d4ee6cf1d46e4ad29282c72bee962 (diff) | |
parent | 5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 (diff) | |
download | vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.gz vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.bz2 vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/include/dix.h')
-rw-r--r-- | xorg-server/include/dix.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h index 34661f3b6..f98c87b04 100644 --- a/xorg-server/include/dix.h +++ b/xorg-server/include/dix.h @@ -529,7 +529,9 @@ extern _X_EXPORT void ScreenRestructured (ScreenPtr pScreen); #endif +#ifndef HAVE_FFS extern _X_EXPORT int ffs(int i); +#endif /* |