From: Brian Paul <brianp@vmware.com>
Date: Thu, 6 Sep 2012 14:16:56 +0000 (-0600)
Subject: glapi/glx: rename 'table' variable to 'disp_table'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=043f66204b1a190e18747c3befa8826c82dd87a7;p=mesa.git

glapi/glx: rename 'table' variable to 'disp_table'

This fixes an issue where the local 'table' variable was hiding the
function parameter name in glGetColorTable(..., void *table).

This should be OK as long as there's never a GL entrypoint that uses
'disp_table' as a parameter name.

Note: This is a candidate for the 9.0 branch.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
---

diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py
index d42f661eaff..34aa2c31f4e 100644
--- a/src/mapi/glapi/gen/glX_proto_send.py
+++ b/src/mapi/glapi/gen/glX_proto_send.py
@@ -423,9 +423,9 @@ __indirect_get_proc_address(const char *name)
 				print ''
 				print '#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)'
 				print '    if (gc->isDirect) {'
-				print '        const _glapi_proc *const table = GET_DISPATCH();'
+				print '        const _glapi_proc *const disp_table = GET_DISPATCH();'
 				print '        PFNGL%sPROC p =' % (name.upper())
-				print '            (PFNGL%sPROC) table[%d];' % (name.upper(), func.offset)
+				print '            (PFNGL%sPROC) disp_table[%d];' % (name.upper(), func.offset)
 				print '    %sp(%s);' % (ret_string, func.get_called_parameter_string())
 				print '    } else'
 				print '#endif'