From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 29 Sep 2017 20:31:21 +0000 (+0200)
Subject: glx: don't use the template keyword
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e90a2ed88ef29f856ee1655975fc07d1ab0636e6;p=mesa.git

glx: don't use the template keyword

for C++ editors

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c
index 2d435f0ee19..5c4346cec0d 100644
--- a/src/glx/dri_glx.c
+++ b/src/glx/dri_glx.c
@@ -558,14 +558,14 @@ CallCreateNewScreen(Display *dpy, int scrn, struct dri_screen *psc,
     * 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))