aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/miext/rootless/rootlessCommon.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-22 13:02:12 +0000
committermarha <marha@users.sourceforge.net>2010-04-22 13:02:12 +0000
commit2446c474aae15bcaf31e4b799f94f21d515984d5 (patch)
tree31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/miext/rootless/rootlessCommon.h
parent0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff)
downloadvcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz
vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2
vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/miext/rootless/rootlessCommon.h')
-rw-r--r--xorg-server/miext/rootless/rootlessCommon.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/miext/rootless/rootlessCommon.h b/xorg-server/miext/rootless/rootlessCommon.h
index d4a94f8ca..f44c4e8cf 100644
--- a/xorg-server/miext/rootless/rootlessCommon.h
+++ b/xorg-server/miext/rootless/rootlessCommon.h
@@ -42,9 +42,7 @@
#include "scrnintstr.h"
-#ifdef RENDER
#include "picturestr.h"
-#endif
// Debug output, or not.
@@ -100,10 +98,8 @@ typedef struct _RootlessScreenRec {
SetShapeProcPtr SetShape;
-#ifdef RENDER
CompositeProcPtr Composite;
GlyphsProcPtr Glyphs;
-#endif
InstallColormapProcPtr InstallColormap;
UninstallColormapProcPtr UninstallColormap;