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

xwin: fix unused variables 

../hw/xwin/winmultiwindowwndproc.c:418:17: warning: unused variable ‘ps’ [-Wunused-variable]
744  418 |     PAINTSTRUCT ps;
745      |                 ^~

../hw/xwin/InitOutput.c:114:13: warning: ‘noDriExtension’ defined but not used [-Wunused-variable]
752  114 | static Bool noDriExtension;
753      |             ^~~~~~~~~~~~~~

375/383] Compiling C object hw/xwin/Xming.exe.p/winprefs.c.obj
799../hw/xwin/winprefs.c: In function ‘LoadImageComma’:
800../hw/xwin/winprefs.c:545:14: warning: unused variable ‘convert’ [-Wunused-variable]
801  545 |         Bool convert = FALSE;
802      |              ^~~~~~~

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1295>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-14 13:45:45 +01:00 committed by Marge Bot
parent de34a20dc3
commit b93c614176
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xwin/InitOutput.c
View File

@ -111,7 +111,11 @@ static PixmapFormatRec g_PixmapFormats[] = {
{32, 32, BITMAP_SCANLINE_PAD} {32, 32, BITMAP_SCANLINE_PAD}
}; };
#ifdef GLXEXT
#ifdef XWIN_WINDOWS_DRI
static Bool noDriExtension; static Bool noDriExtension;
#endif
#endif
static const ExtensionModule xwinExtensions[] = { static const ExtensionModule xwinExtensions[] = {
#ifdef GLXEXT #ifdef GLXEXT

2
hw/xwin/winmultiwindowwndproc.c
View File

@ -415,7 +415,6 @@ LRESULT CALLBACK
winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
POINT ptMouse; POINT ptMouse;
PAINTSTRUCT ps;
WindowPtr pWin = NULL; WindowPtr pWin = NULL;
winPrivWinPtr pWinPriv = NULL; winPrivWinPtr pWinPriv = NULL;
ScreenPtr s_pScreen = NULL; ScreenPtr s_pScreen = NULL;
@ -578,6 +577,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
#ifdef XWIN_GLX_WINDOWS #ifdef XWIN_GLX_WINDOWS
if (pWinPriv->fWglUsed) { if (pWinPriv->fWglUsed) {
PAINTSTRUCT ps;
/* /*
For regions which are being drawn by GL, the shadow framebuffer doesn't have the For regions which are being drawn by GL, the shadow framebuffer doesn't have the
correct bits, so don't bitblt from the shadow framebuffer correct bits, so don't bitblt from the shadow framebuffer

2
hw/xwin/winprefs.c
View File

@ -542,7 +542,9 @@ LoadImageComma(char *fname, char *iconDirectory, int sx, int sy, int flags)
} }
else { else {
char *file = malloc(PATH_MAX + NAME_MAX + 2); char *file = malloc(PATH_MAX + NAME_MAX + 2);
#ifdef __CYGWIN__
Bool convert = FALSE; Bool convert = FALSE;
#endif
if (!file) if (!file)
return NULL; return NULL;