diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/fb/fbscreen.c | |
parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/fb/fbscreen.c')
-rw-r--r-- | xorg-server/fb/fbscreen.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/fb/fbscreen.c b/xorg-server/fb/fbscreen.c index 12b19e419..ea2491211 100644 --- a/xorg-server/fb/fbscreen.c +++ b/xorg-server/fb/fbscreen.c @@ -90,11 +90,7 @@ _fbGetWindowPixmap (WindowPtr pWindow) void _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap) { -#ifdef FB_NO_WINDOW_PIXMAPS - FatalError ("Attempted to set window pixmap without fb support\n"); -#else dixSetPrivate(&pWindow->devPrivates, fbGetWinPrivateKey(), pPixmap); -#endif } Bool |