xserver: Branch 'master'

[Alan Coopersmith]

 cfb/cfbmskbits.h |    3 ---
 1 files changed, 3 deletions(-)

New commits:
diff-tree 2dfd1aab244a2c8da3b62b522b9a8434e474af17 (from 42a48786acf54f83167de4f561526986d4e27033)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Jan 17 14:39:28 2007 -0800

    Always include compiler.h in cfbmskbits.h instead of checking #ifdef XFREE86

diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h
index 7aa446c..6076269 100644
--- a/cfb/cfbmskbits.h
+++ b/cfb/cfbmskbits.h
@@ -32,10 +32,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include	<X11/X.h>
 #include	<X11/Xmd.h>
 #include	"servermd.h"
-#if defined(XFREE86) || ( defined(__OpenBSD__) && defined(__alpha__) ) \
-	|| (defined(__bsdi__))
 #include	"compiler.h"
-#endif
 
 /*
  * ==========================================================================