diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
| commit | 2446c474aae15bcaf31e4b799f94f21d515984d5 (patch) | |
| tree | 31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/hw/xfree86/xaa/xaalocal.h | |
| parent | 0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff) | |
| download | vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2 vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip | |
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/xfree86/xaa/xaalocal.h')
| -rw-r--r-- | xorg-server/hw/xfree86/xaa/xaalocal.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/xorg-server/hw/xfree86/xaa/xaalocal.h b/xorg-server/hw/xfree86/xaa/xaalocal.h index 5e3d373c6..129c1d6c4 100644 --- a/xorg-server/hw/xfree86/xaa/xaalocal.h +++ b/xorg-server/hw/xfree86/xaa/xaalocal.h @@ -10,9 +10,7 @@ #include "xf86fbman.h" #include "xaa.h" #include "mi.h" -#ifdef RENDER #include "picturestr.h" -#endif #define GCWhenForced (GCArcMode << 1) @@ -55,10 +53,8 @@ typedef struct _XAAScreen { void (*LeaveVT)(int, int); int (*SetDGAMode)(int, int, DGADevicePtr); void (*EnableDisableFBAccess)(int, Bool); -#ifdef RENDER CompositeProcPtr Composite; GlyphsProcPtr Glyphs; -#endif } XAAScreenRec, *XAAScreenPtr; #define OPS_ARE_PIXMAP 0x00000001 @@ -1539,7 +1535,6 @@ extern _X_EXPORT void XAARemoveAreaCallback(FBAreaPtr area); extern _X_EXPORT void XAAMoveOutOffscreenPixmap(PixmapPtr pPix); extern _X_EXPORT Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec); -#ifdef RENDER extern _X_EXPORT void XAAComposite (CARD8 op, PicturePtr pSrc, @@ -1627,8 +1622,6 @@ XAAGetPixelFromRGBA ( CARD32 format ); -#endif - /* XXX should be static */ extern _X_EXPORT GCOps XAAFallbackOps; extern _X_EXPORT GCOps *XAAGetFallbackOps(void); |