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/dmx/dmxinit.c | |
| 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/dmx/dmxinit.c')
| -rw-r--r-- | xorg-server/hw/dmx/dmxinit.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c index 739c4ca7f..617ec5e49 100644 --- a/xorg-server/hw/dmx/dmxinit.c +++ b/xorg-server/hw/dmx/dmxinit.c @@ -53,9 +53,7 @@ #include "dmxcb.h"
#include "dmxprop.h"
#include "dmxstat.h"
-#ifdef RENDER
#include "dmxpict.h"
-#endif
#include <X11/Xos.h> /* For gettimeofday */
#include "dixstruct.h"
@@ -795,11 +793,9 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[]) */
dmxInitFonts();
-#ifdef RENDER
/* Initialize the render extension */
if (!noRenderExtension)
dmxInitRender();
-#endif
/* Initialized things that need timer hooks */
dmxStatInit();
|