From f9a7c50ed6ff89414247929b2d4b52e32c5c9350 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue, 3 Feb 2026 18:09:34 +0000
Subject: [PATCH] glx/windows: Avoid shadowing 'type' parameter of
 driwindowsCreateDrawable()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

> ../src/glx/driwindows_glx.c: In function ‘driwindowsCreateDrawable’:
> ../src/glx/driwindows_glx.c:283:17: error: ‘type’ redeclared as different kind of symbol
>  283 |    unsigned int type;
>      |                 ^~~~
> ../src/glx/driwindows_glx.c:261:52: note: previous definition of ‘type’ with type ‘int’
>   261 |                          GLXDrawable drawable, int type,
>      |                                                ~~~~^~~~

Fixes: 887f5a632046 ("glx: add drawable type argument when create drawable")
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41421>
---
 src/glx/driwindows_glx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/glx/driwindows_glx.c b/src/glx/driwindows_glx.c
index 26d2a400cdd..2cc03f36d91 100644
--- a/src/glx/driwindows_glx.c
+++ b/src/glx/driwindows_glx.c
@@ -273,10 +273,10 @@ driwindowsCreateDrawable(struct glx_screen *base, XID xDrawable,
       HBITMAP
    */
 
-   unsigned int type;
+   unsigned int drawable_type;
    void *handle;
 
-   if (!XWindowsDRIQueryDrawable(psc->base.dpy, base->scr, drawable, &type, &handle))
+   if (!XWindowsDRIQueryDrawable(psc->base.dpy, base->scr, drawable, &drawable_type, &handle))
    {
       free(pdp);
       return NULL;
@@ -289,7 +289,7 @@ driwindowsCreateDrawable(struct glx_screen *base, XID xDrawable,
    }
 
    /* Create a new drawable */
-   pdp->windowsDrawable = windows_create_drawable(type, handle);
+   pdp->windowsDrawable = windows_create_drawable(drawable_type, handle);
 
    if (!pdp->windowsDrawable) {
       free(pdp);