aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-20 16:53:00 +0000
committermarha <marha@users.sourceforge.net>2011-03-20 16:53:00 +0000
commit6e973f9f133979796ca35d275470255271f39fce (patch)
treed2ea3c36dda5d95b6e52b831daab6cbfb1dd1fd3 /xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
parentf42328963ef48163c38adf72c067078eaa717cff (diff)
parenteca5dee9e7a8dea1edba4d10b60444ac0e884139 (diff)
downloadvcxsrv-6e973f9f133979796ca35d275470255271f39fce.tar.gz
vcxsrv-6e973f9f133979796ca35d275470255271f39fce.tar.bz2
vcxsrv-6e973f9f133979796ca35d275470255271f39fce.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h')
-rw-r--r--xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
index 0f8416b71..13fde5e79 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -155,7 +155,7 @@ static void VGAarbiterCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
static void VGAarbiterClearToBackground (WindowPtr pWin, int x, int y, int w,
int h, Bool generateExposures);
static PixmapPtr VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h,
- int depth, unsigned int class);
+ int depth, unsigned int usage_hint);
static Bool VGAarbiterCreateGC(GCPtr pGC);
static Bool VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank);
static void VGAarbiterStoreColors (ColormapPtr pmap, int ndef, xColorItem