xserver: Branch 'master' - 3 commits
Keith Packard
keithp at kemper.freedesktop.org
Mon Aug 17 18:39:19 PDT 2015
mi/mioverlay.c | 1 -
miext/rootless/rootlessCommon.h | 22 +++++++++++-----------
miext/rootless/rootlessGC.c | 2 +-
3 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit d4710004367ab8eab794a12385ca7ed3acc9a0e0
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 13 09:25:37 2015 +1000
rootless: rename w->_w to avoid shadow warnings
fixes:
In file included from rootlessWindow.c:51:0:
rootlessWindow.c: In function 'RootlessResizeWindow':
rootlessCommon.h:198:19: warning: declaration of 'w' shadows a parameter [-Wshadow]
WindowPtr w = pWin; \
^
rootlessWindow.c:1292:9: note: in expansion of macro 'HUGE_ROOT'
HUGE_ROOT(pWin);
^
rootlessWindow.c:1262:35: note: shadowed declaration is here
unsigned int w, unsigned int h, WindowPtr pSib)
^
In file included from rootlessWindow.c:51:0:
rootlessCommon.h:207:19: warning: declaration of 'w' shadows a parameter [-Wshadow]
WindowPtr w = pWin; \
^
rootlessWindow.c:1296:9: note: in expansion of macro 'NORMAL_ROOT'
NORMAL_ROOT(pWin);
^
rootlessWindow.c:1262:35: note: shadowed declaration is here
unsigned int w, unsigned int h, WindowPtr pSib)
^
Signed-off-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h
index 7c26111..c3fa2a2 100644
--- a/miext/rootless/rootlessCommon.h
+++ b/miext/rootless/rootlessCommon.h
@@ -195,19 +195,19 @@ extern RegionRec rootlessHugeRoot;
#define HUGE_ROOT(pWin) \
do { \
- WindowPtr w = pWin; \
- while (w->parent) \
- w = w->parent; \
- saveRoot = w->winSize; \
- w->winSize = rootlessHugeRoot; \
+ WindowPtr _w = pWin; \
+ while (_w->parent) \
+ _w = _w->parent; \
+ saveRoot = _w->winSize; \
+ _w->winSize = rootlessHugeRoot; \
} while (0)
#define NORMAL_ROOT(pWin) \
do { \
- WindowPtr w = pWin; \
- while (w->parent) \
- w = w->parent; \
- w->winSize = saveRoot; \
+ WindowPtr _w = pWin; \
+ while (_w->parent) \
+ _w = _w->parent; \
+ _w->winSize = saveRoot; \
} while (0)
// Returns TRUE if this window is a top-level window (i.e. child of the root)
commit 7f506b8099d23c2f045ad26cc5cff00109b69d7b
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 13 09:25:36 2015 +1000
rootless: fix warnings due to lack of const keeping.
Signed-off-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h
index aa55579..7c26111 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 4fba26c..235b3ab 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;
commit b923443816320d0636d6fd40c3c1125b93332907
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 13 09:25:35 2015 +1000
mioverlay.c: remove shadowed pScreen.
This is already defined at the function entry.
fixes warning:
CC mivaltree.lo
mioverlay.c: In function 'miOverlayWindowExposures':
mioverlay.c:993:23: warning: declaration of 'pScreen' shadows a previous local [-Wshadow]
ScreenPtr pScreen = pWin->drawable.pScreen;
^
mioverlay.c:986:15: note: shadowed declaration is here
ScreenPtr pScreen = pWin->drawable.pScreen;
Signed-off-by: Dave Airlie <airlied at redhat.com>>
Reviewed-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index 9f3ef07..b8b7a5b 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -990,7 +990,6 @@ miOverlayWindowExposures(WindowPtr pWin, RegionPtr prgn)
int clientInterested =
(pWin->eventMask | wOtherEventMasks(pWin)) & ExposureMask;
if (clientInterested && (RegionNumRects(prgn) > RECTLIMIT)) {
- ScreenPtr pScreen = pWin->drawable.pScreen;
miOverlayScreenPtr pPriv = MIOVERLAY_GET_SCREEN_PRIVATE(pScreen);
BoxRec box;
More information about the xorg-commit
mailing list