From 2446c474aae15bcaf31e4b799f94f21d515984d5 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 22 Apr 2010 13:02:12 +0000
Subject: svn merge -r541:HEAD "^/branches/released" .

---
 xorg-server/hw/xwin/InitOutput.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'xorg-server/hw/xwin/InitOutput.c')

diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index f65d7c9b0..ffbc44643 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -47,7 +47,6 @@ from The Open Group.
 #if defined(WIN32)
 #include "xkbsrv.h"
 #endif
-
 #ifdef RELOCATE_PROJECTROOT
 #undef Status
 #include <shlobj.h>
@@ -160,9 +159,7 @@ static PixmapFormatRec g_PixmapFormats[] = {
   { 15,   16,     BITMAP_SCANLINE_PAD },
   { 16,   16,     BITMAP_SCANLINE_PAD },
   { 24,   32,     BITMAP_SCANLINE_PAD },
-#ifdef RENDER
   { 32,   32,     BITMAP_SCANLINE_PAD }
-#endif
 };
 
 const int NUMFORMATS = sizeof (g_PixmapFormats) / sizeof (g_PixmapFormats[0]);
-- 
cgit v1.2.3