summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-08-13 09:25:36 +1000
committerAdam Jackson <ajax@redhat.com>2015-10-26 12:17:57 -0400
commit3aacda0aea221f703d469de82a8a6778677b34d0 (patch)
treeb238232e26e944c81fc8a6f6603fa32f0ad33833
parent02c94ccddf4fc9ea08555e929b051201ad5fbc79 (diff)
rootless: fix warnings due to lack of const keeping.
Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 7f506b8099d23c2f045ad26cc5cff00109b69d7b)
-rw-r--r--miext/rootless/rootlessCommon.h4
-rw-r--r--miext/rootless/rootlessGC.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h
index fd9c941f4..3e194818f 100644
--- a/miext/rootless/rootlessCommon.h
+++ b/miext/rootless/rootlessCommon.h
@@ -70,8 +70,8 @@ extern DevPrivateKeyRec rootlessWindowOldPixmapPrivateKeyRec;
// RootlessGCRec: private per-gc data
typedef struct {
- GCFuncs *originalFuncs;
- GCOps *originalOps;
+ const GCFuncs *originalFuncs;
+ const GCOps *originalOps;
} RootlessGCRec;
// RootlessScreenRec: per-screen private data
diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c
index 4fba26c8d..235b3ab7c 100644
--- a/miext/rootless/rootlessGC.c
+++ b/miext/rootless/rootlessGC.c
@@ -403,7 +403,7 @@ RootlessCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
#define GCOP_UNWRAP(pGC) \
RootlessGCRec *gcrec = (RootlessGCRec *) \
dixLookupPrivate(&(pGC)->devPrivates, rootlessGCPrivateKey); \
- GCFuncs *saveFuncs = pGC->funcs; \
+ const GCFuncs *saveFuncs = pGC->funcs; \
(pGC)->funcs = gcrec->originalFuncs; \
(pGC)->ops = gcrec->originalOps;