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/include | |
| 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/include')
| -rw-r--r-- | xorg-server/include/pixmapstr.h | 1 | ||||
| -rw-r--r-- | xorg-server/include/scrnintstr.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h index 47dce91e1..19190e697 100644 --- a/xorg-server/include/pixmapstr.h +++ b/xorg-server/include/pixmapstr.h @@ -78,6 +78,7 @@ typedef struct _Pixmap { DevUnion devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */
short screen_x;
short screen_y;
+ unsigned usage_hint; /* see CREATE_PIXMAP_USAGE_* */
} PixmapRec;
#endif /* PIXMAPSTRUCT_H */
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h index 28dd2c011..a373acd27 100644 --- a/xorg-server/include/scrnintstr.h +++ b/xorg-server/include/scrnintstr.h @@ -208,7 +208,7 @@ typedef PixmapPtr (* CreatePixmapProcPtr)( int /*width*/,
int /*height*/,
int /*depth*/,
- unsigned /*class*/);
+ unsigned /*usage_hint*/);
typedef Bool (* DestroyPixmapProcPtr)(
PixmapPtr /*pPixmap*/);
|