From: Tim Waugh <twaugh@redhat.com>
Date: Thu, 4 Sep 2014 11:36:09 +0000 (+0100)
Subject: GCFuncs and GCOps are const since 1.16.
X-Git-Tag: v1.3.90~37^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=11e35b81a97ac8c9c692bed43c43af3c0df2ef4f;p=tigervnc.git

GCFuncs and GCOps are const since 1.16.
---

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;
 };