← Back to branch summary

~ubuntu-branches/ubuntu/vivid/xorg-server/vivid

« back to all changes in this revision

Viewing changes to hw/xwin/glx/gen_gl_wrappers.py

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2013-07-03 12:03:57 UTC
  • mfrom: (1.1.56)
  • Revision ID: package-import@ubuntu.com-20130703120357-caosebpn11zu2zj0
Tags: 2:1.14.1-0ubuntu0.8
Use correct version for libxfixes3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xwin/glx/gen_gl_wrappers.py
146
146
                        arglist_use = m1.group(2)
147
147
                        wrappers[function] = {}
148
148
 
149
 
                        # near and far might be reserved words or macros so can't be used as formal parameter names
150
 
                        arglist_use = arglist_use.replace('near','zNear')
151
 
                        arglist_use = arglist_use.replace('far','zFar')
 
149
                        # ensure formal parameter names don't collide with reserved names or shadow global declarations
 
150
                        arglist_use = ',' .join([i.rstrip() + '_' for i in arglist_use.split(",")])
152
151
 
153
152
                        wrappers[function]['arglist_use'] = arglist_use
154
153
                        param_count = 0
217
216
                if k.startswith('param') :
218
217
                        l = wrappers[w][k].split()
219
218
 
220
 
                        # near and far might be reserved words or macros so can't be used as formal parameter names
221
 
                        l[0] = l[0].replace('near','zNear')
222
 
                        l[0] = l[0].replace('far','zFar')
 
219
                        # ensure formal parameter names don't collide with reserved names or shadow global declarations
 
220
                        l[0] = l[0] + '_'
223
221
 
224
222
                        if l[2] == 'in' :
225
223
                                if l[3] == 'array' :