aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xext/panoramiX.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/Xext/panoramiX.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/Xext/panoramiX.h')
-rw-r--r--xorg-server/Xext/panoramiX.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/Xext/panoramiX.h b/xorg-server/Xext/panoramiX.h
index cca4c5249..463a99441 100644
--- a/xorg-server/Xext/panoramiX.h
+++ b/xorg-server/Xext/panoramiX.h
@@ -69,11 +69,9 @@ typedef struct {
struct {
Bool shared;
} pix;
-#ifdef RENDER
struct {
Bool root;
} pict;
-#endif
char raw_data[4];
} u;
} PanoramiXRes;