Mesa (master): glx: don't use the template keyword

[Marek Olšák]

Module: Mesa
Branch: master
Commit: e90a2ed88ef29f856ee1655975fc07d1ab0636e6
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e90a2ed88ef29f856ee1655975fc07d1ab0636e6

Author: Marek Olšák <marek.ol...@amd.com>
Date:   Fri Sep 29 22:31:21 2017 +0200

glx: don't use the template keyword

for C++ editors

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

---

 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 2d435f0ee1..5c4346cec0 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))

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit