diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
| commit | 2446c474aae15bcaf31e4b799f94f21d515984d5 (patch) | |
| tree | 31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/hw/kdrive/src | |
| parent | 0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff) | |
| download | vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2 vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip | |
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/kdrive/src')
| -rw-r--r-- | xorg-server/hw/kdrive/src/kdrive.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c index 84e456be7..a8eb3996b 100644 --- a/xorg-server/hw/kdrive/src/kdrive.c +++ b/xorg-server/hw/kdrive/src/kdrive.c @@ -1005,10 +1005,8 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) pScreen->BlockHandler = KdBlockHandler;
pScreen->WakeupHandler = KdWakeupHandler;
-#ifdef RENDER
if (!fbPictureInit (pScreen, 0, 0))
return FALSE;
-#endif
if (card->cfuncs->initScreen)
if (!(*card->cfuncs->initScreen) (pScreen))
return FALSE;
@@ -1274,9 +1272,7 @@ void OsVendorFatalError(void)
{
}
-#endif
-#ifndef _MSC_VER
int
DPMSSet(ClientPtr client, int level)
{
|