From 2446c474aae15bcaf31e4b799f94f21d515984d5 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 22 Apr 2010 13:02:12 +0000 Subject: svn merge -r541:HEAD "^/branches/released" . --- xorg-server/hw/xquartz/darwin.c | 2 -- xorg-server/hw/xquartz/mach-startup/launchd_fd.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'xorg-server/hw/xquartz') 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_ */ -- cgit v1.2.3