aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fb/fbscreen.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-11 14:16:16 +0000
committermarha <marha@users.sourceforge.net>2010-06-11 14:16:16 +0000
commitd1e4f4b8546c7955c66dd023bfd6ef437db9d21d (patch)
tree529985e77bfc95aa95fe5b540e8f42b0ef041206 /xorg-server/fb/fbscreen.c
parent13919cf85a6ca41d97238de13344aba59e0f7680 (diff)
parent4c61bf84b11e26e6f22648668c95ea760a379163 (diff)
downloadvcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.gz
vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.bz2
vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fb/fbscreen.c')
-rw-r--r--xorg-server/fb/fbscreen.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/xorg-server/fb/fbscreen.c b/xorg-server/fb/fbscreen.c
index 65af64074..f6eda6d64 100644
--- a/xorg-server/fb/fbscreen.c
+++ b/xorg-server/fb/fbscreen.c
@@ -37,22 +37,19 @@ fbCloseScreen (int index, ScreenPtr pScreen)
free(depths);
free(pScreen->visuals);
free(pScreen->devPrivate);
-#ifdef FB_SCREEN_PRIVATE
- free(dixLookupPrivate(&pScreen->devPrivates, fbGetScreenPrivateKey()));
-#endif
return TRUE;
}
Bool
fbRealizeFont(ScreenPtr pScreen, FontPtr pFont)
{
- return (TRUE);
+ return TRUE;
}
Bool
fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
{
- return (TRUE);
+ return TRUE;
}
void