diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/fb/fb.h | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/fb/fb.h')
| -rw-r--r-- | xorg-server/fb/fb.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h index 1cd947380..4572af612 100644 --- a/xorg-server/fb/fb.h +++ b/xorg-server/fb/fb.h @@ -101,9 +101,6 @@ #if GLYPHPADBYTES != 4 #error "GLYPHPADBYTES must be 4" #endif -#if GETLEFTBITS_ALIGNMENT != 1 -#error "GETLEFTBITS_ALIGNMENT must be 1" -#endif /* whether to bother to include 24bpp support */ #ifndef FBNO24BIT #define FB_24BIT @@ -141,9 +138,8 @@ typedef unsigned __int64 FbBits; defined(ia64) || defined(__ia64__) || \ defined(__sparc64__) || defined(_LP64) || \ defined(__s390x__) || \ - defined(amd64) || defined (__amd64__) || defined(__x86_64__) || \ - defined (__powerpc64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) + defined(amd64) || defined (__amd64__) || \ + defined (__powerpc64__) typedef unsigned long FbBits; # else typedef unsigned long long FbBits; @@ -600,9 +596,7 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data); } extern DevPrivateKey fbGetGCPrivateKey(void); -#ifndef FB_NO_WINDOW_PIXMAPS extern DevPrivateKey fbGetWinPrivateKey(void); -#endif extern const GCOps fbGCOps; extern const GCFuncs fbGCFuncs; @@ -673,12 +667,8 @@ typedef struct { #define fbGetRotatedPixmap(pGC) ((pGC)->pRotatedPixmap) #define fbGetScreenPixmap(s) ((PixmapPtr) (s)->devPrivate) -#ifdef FB_NO_WINDOW_PIXMAPS -#define fbGetWindowPixmap(d) fbGetScreenPixmap(((DrawablePtr) (d))->pScreen) -#else #define fbGetWindowPixmap(pWin) ((PixmapPtr)\ dixLookupPrivate(&((WindowPtr)(pWin))->devPrivates, fbGetWinPrivateKey())) -#endif #ifdef ROOTLESS #define __fbPixDrawableX(pPix) ((pPix)->drawable.x) |