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/dmx/dmxclient.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'xorg-server/hw/dmx/dmxclient.h')

diff --git a/xorg-server/hw/dmx/dmxclient.h b/xorg-server/hw/dmx/dmxclient.h
index 147d14ed8..c45f71fc0 100644
--- a/xorg-server/hw/dmx/dmxclient.h
+++ b/xorg-server/hw/dmx/dmxclient.h
@@ -86,10 +86,8 @@ typedef XID           KeySym64;
 
 #include <X11/extensions/shape.h>
 
-#ifdef RENDER
 #include <X11/extensions/Xrender.h>
 #undef PictFormatType
-#endif
 
 #include <X11/extensions/XKB.h>
 #include "xkbstr.h"
-- 
cgit v1.2.3