summaryrefslogtreecommitdiffstats
path: root/unix/xserver
diff options
context:
space:
mode:
authorTim Waugh <twaugh@redhat.com>2014-09-04 12:36:09 +0100
committerTim Waugh <twaugh@redhat.com>2014-09-04 12:37:12 +0100
commit11e35b81a97ac8c9c692bed43c43af3c0df2ef4f (patch)
tree3db0d7b97cfda819052024b6361e384b772a9752 /unix/xserver
parent300411c623d8f8a52caf8d868b6cc24859d620b5 (diff)
downloadtigervnc-11e35b81a97ac8c9c692bed43c43af3c0df2ef4f.tar.gz
tigervnc-11e35b81a97ac8c9c692bed43c43af3c0df2ef4f.zip
GCFuncs and GCOps are const since 1.16.
Diffstat (limited to 'unix/xserver')
-rw-r--r--unix/xserver/hw/vnc/vncHooks.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/unix/xserver/hw/vnc/vncHooks.cc b/unix/xserver/hw/vnc/vncHooks.cc
index 29de4c4c..f75a2d49 100644
--- a/unix/xserver/hw/vnc/vncHooks.cc
+++ b/unix/xserver/hw/vnc/vncHooks.cc
@@ -89,8 +89,13 @@ typedef struct {
} vncHooksScreenRec, *vncHooksScreenPtr;
typedef struct {
+#if XORG >= 116
const GCFuncs *wrappedFuncs;
const GCOps *wrappedOps;
+#else
+ GCFuncs *wrappedFuncs;
+ GCOps *wrappedOps;
+#endif
} vncHooksGCRec, *vncHooksGCPtr;
#if XORG == 15
@@ -916,7 +921,11 @@ public:
}
GCPtr pGC;
vncHooksGCPtr vncHooksGC;
+#if XORG >= 116
const GCFuncs* oldFuncs;
+#else
+ GCFuncs* oldFuncs;
+#endif
ScreenPtr pScreen;
};