diff options
author | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
commit | 4b1326f06330c00501dd84100ed3a1987e2fa631 (patch) | |
tree | 6675ebcf771a6fdfeb9a2164f08811407731482e /xorg-server/hw/kdrive/fbdev/fbdev.h | |
parent | 7397e255c2e82618ab55ef2c81636c8e688b1225 (diff) | |
parent | 163827567b71b0763a4c1a7104159cd08b5c2d95 (diff) | |
download | vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.gz vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.bz2 vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/kdrive/fbdev/fbdev.h')
-rw-r--r-- | xorg-server/hw/kdrive/fbdev/fbdev.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/hw/kdrive/fbdev/fbdev.h b/xorg-server/hw/kdrive/fbdev/fbdev.h index 9e322dacb..3da8e4753 100644 --- a/xorg-server/hw/kdrive/fbdev/fbdev.h +++ b/xorg-server/hw/kdrive/fbdev/fbdev.h @@ -42,11 +42,10 @@ typedef struct _fbdevPriv { char *fb; char *fb_base; } FbdevPriv; - + typedef struct _fbdevScrPriv { Rotation randr; Bool shadow; - PixmapPtr pShadow; } FbdevScrPriv; extern KdCardFuncs fbdevFuncs; @@ -63,7 +62,7 @@ fbdevScreenInit (KdScreenInfo *screen); Bool fbdevScreenInitialize (KdScreenInfo *screen, FbdevScrPriv *scrpriv); - + Bool fbdevInitScreen (ScreenPtr pScreen); @@ -122,7 +121,7 @@ fbdevSetShadow (ScreenPtr pScreen); Bool fbdevCreateColormap (ColormapPtr pmap); - + #ifdef RANDR Bool fbdevRandRGetInfo (ScreenPtr pScreen, Rotation *rotations); |