aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-22 08:57:22 +0000
committermarha <marha@users.sourceforge.net>2010-04-22 08:57:22 +0000
commitd2bf55b405ea8f980984aab4be7d4b878c9e6981 (patch)
tree676ad441e287f6de1950260c3d2ef0b720f69bad /xorg-server/hw/xquartz
parenta46e26df6103fb0e6e00d8d11d58c3f7a358208c (diff)
downloadvcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.gz
vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.bz2
vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.zip
git update 22/4/2010
Diffstat (limited to 'xorg-server/hw/xquartz')
-rw-r--r--xorg-server/hw/xquartz/darwin.c2
-rw-r--r--xorg-server/hw/xquartz/mach-startup/launchd_fd.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index d3f448820..1fb158b26 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -240,11 +240,9 @@ static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv
return FALSE;
}
-#ifdef RENDER
if (! fbPictureInit(pScreen, 0, 0)) {
return FALSE;
}
-#endif
#ifdef MITSHM
ShmRegisterFbFuncs(pScreen);
diff --git a/xorg-server/hw/xquartz/mach-startup/launchd_fd.h b/xorg-server/hw/xquartz/mach-startup/launchd_fd.h
index 5083fae21..12caf7193 100644
--- a/xorg-server/hw/xquartz/mach-startup/launchd_fd.h
+++ b/xorg-server/hw/xquartz/mach-startup/launchd_fd.h
@@ -33,4 +33,4 @@
int launchd_display_fd(void);
-#endif /* _XQUARTZ_LAUNCHD_FD_H_ */ \ No newline at end of file
+#endif /* _XQUARTZ_LAUNCHD_FD_H_ */