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@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
7f506b8099
commit
d471000436
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue