frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mi: miexpose: fix FTBS w/ rootless helper 

FTBS when rootless subsys enabled:

> ../mi/miexpose.c: In function ‘miPaintWindow’:
> ../mi/miexpose.c:411:15: error: unused variable ‘orig_pWin’ [-Werror=unused-variable]
>   411 |     WindowPtr orig_pWin = pWin;
>       |               ^~~~~~~~~
> cc1: all warnings being treated as errors

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1703>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-23 19:50:55 +02:00 committed by Marge Bot
parent bcbc7479f3
commit 6ee163cb94
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mi/miexpose.c
View File

@ -403,9 +403,6 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
BoxPtr pbox; BoxPtr pbox;
xRectangle *prect; xRectangle *prect;
int numRects, regionnumrects; int numRects, regionnumrects;
#ifdef COMPOSITE
WindowPtr orig_pWin = pWin;
#endif
/* /*
* Distance from screen to destination drawable, use this * Distance from screen to destination drawable, use this
@ -492,6 +489,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
#ifdef COMPOSITE #ifdef COMPOSITE
/* Make sure alpha will sample as 1.0 for opaque windows */ /* Make sure alpha will sample as 1.0 for opaque windows */
if (drawable->depth == 32) { if (drawable->depth == 32) {
WindowPtr orig_pWin = pWin;
int effective_depth = orig_pWin->drawable.depth; int effective_depth = orig_pWin->drawable.depth;
if (effective_depth == 32) { if (effective_depth == 32) {