diff options
author | marha <marha@users.sourceforge.net> | 2011-03-20 16:53:00 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-03-20 16:53:00 +0000 |
commit | 6e973f9f133979796ca35d275470255271f39fce (patch) | |
tree | d2ea3c36dda5d95b6e52b831daab6cbfb1dd1fd3 /xorg-server/fb/fb.h | |
parent | f42328963ef48163c38adf72c067078eaa717cff (diff) | |
parent | eca5dee9e7a8dea1edba4d10b60444ac0e884139 (diff) | |
download | vcxsrv-6e973f9f133979796ca35d275470255271f39fce.tar.gz vcxsrv-6e973f9f133979796ca35d275470255271f39fce.tar.bz2 vcxsrv-6e973f9f133979796ca35d275470255271f39fce.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fb/fb.h')
-rw-r--r-- | xorg-server/fb/fb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h index a33cc40ce..29eecadb3 100644 --- a/xorg-server/fb/fb.h +++ b/xorg-server/fb/fb.h @@ -1598,11 +1598,11 @@ fbPictureInit (ScreenPtr pScreen, extern _X_EXPORT PixmapPtr
fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
- unsigned class);
+ unsigned usage_hint);
extern _X_EXPORT PixmapPtr
fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
- unsigned class);
+ unsigned usage_hint);
extern _X_EXPORT Bool
fbDestroyPixmap (PixmapPtr pPixmap);
|