[Mesa-dev] [PATCH 3/4] glx: don't use the template keyword

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

for C++ editors
---
 src/glx/dri_glx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c
index 2d435f0..5c4346c 100644
--- a/src/glx/dri_glx.c
+++ b/src/glx/dri_glx.c
@@ -551,28 +551,28 @@ CallCreateNewScreen(Display *dpy, int scrn, struct dri_screen *psc,
    glx_config_destroy_list(psc->base.visuals);
    psc->base.visuals = visuals;
 
    psc->driver_configs = driver_configs;
 
    /* Visuals with depth != screen depth are subject to automatic compositing
     * in the X server, so DRI1 can't render to them properly. Mark them as
     * non-conformant to prevent apps from picking them up accidentally.
     */
    for (visual = psc->base.visuals; visual; visual = visual->next) {
-      XVisualInfo template;
+      XVisualInfo templ;
       XVisualInfo *visuals;
       int num_visuals;
       long mask;
 
-      template.visualid = visual->visualID;
+      templ.visualid = visual->visualID;
       mask = VisualIDMask;
-      visuals = XGetVisualInfo(dpy, mask, &template, &num_visuals);
+      visuals = XGetVisualInfo(dpy, mask, &templ, &num_visuals);
 
       if (visuals) {
          if (num_visuals > 0 && visuals->depth != DefaultDepth(dpy, scrn))
             visual->visualRating = GLX_NON_CONFORMANT_CONFIG;
 
          free(visuals);
       }
    }
 
    return psp;
-- 
2.7.4