diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-30 08:08:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-30 08:08:23 +0100 |
| commit | 7b3f315a5d8b90dcb0db5512ed91fa700027cb7a (patch) | |
| tree | 5d8a2f4983d9814c71325059d75e6de2af1a3b3e /xorg-server/hw/xwin/glx | |
| parent | 8d86f8c566c4181c846a872a5a2f88718e635a72 (diff) | |
| download | vcxsrv-7b3f315a5d8b90dcb0db5512ed91fa700027cb7a.tar.gz vcxsrv-7b3f315a5d8b90dcb0db5512ed91fa700027cb7a.tar.bz2 vcxsrv-7b3f315a5d8b90dcb0db5512ed91fa700027cb7a.zip | |
fontconfig xserver mesa git update 30 oct 2012
fontconfig: bdaef0b80dc27f4ab7a9d9bcedcfd8b5724b3cfd
xserver: 1ca096d5e07221025c4c4110528772b7d94f15ee
mesa: 0a66ced8f822b0d5478b0cd6d72c1a6ad70647a2
Diffstat (limited to 'xorg-server/hw/xwin/glx')
| -rw-r--r-- | xorg-server/hw/xwin/glx/gen_gl_wrappers.py | 10 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/glwrap.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/indirect.c | 12 |
3 files changed, 11 insertions, 13 deletions
diff --git a/xorg-server/hw/xwin/glx/gen_gl_wrappers.py b/xorg-server/hw/xwin/glx/gen_gl_wrappers.py index 15f7ef868..2273589c9 100644 --- a/xorg-server/hw/xwin/glx/gen_gl_wrappers.py +++ b/xorg-server/hw/xwin/glx/gen_gl_wrappers.py @@ -146,9 +146,8 @@ for line in glspec : arglist_use = m1.group(2) wrappers[function] = {} - # near and far might be reserved words or macros so can't be used as formal parameter names - arglist_use = arglist_use.replace('near','zNear') - arglist_use = arglist_use.replace('far','zFar') + # ensure formal parameter names don't collide with reserved names or shadow global declarations + arglist_use = ',' .join([i.rstrip() + '_' for i in arglist_use.split(",")]) wrappers[function]['arglist_use'] = arglist_use param_count = 0 @@ -217,9 +216,8 @@ for w in sorted(wrappers.keys()) : if k.startswith('param') : l = wrappers[w][k].split() - # near and far might be reserved words or macros so can't be used as formal parameter names - l[0] = l[0].replace('near','zNear') - l[0] = l[0].replace('far','zFar') + # ensure formal parameter names don't collide with reserved names or shadow global declarations + l[0] = l[0] + '_' if l[2] == 'in' : if l[3] == 'array' : diff --git a/xorg-server/hw/xwin/glx/glwrap.c b/xorg-server/hw/xwin/glx/glwrap.c index 690b82926..73cff3cc1 100644 --- a/xorg-server/hw/xwin/glx/glwrap.c +++ b/xorg-server/hw/xwin/glx/glwrap.c @@ -67,7 +67,7 @@ glWinCallDelta(void) } static PROC -glWinResolveHelper(PROC * cache, char *symbol) +glWinResolveHelper(PROC * cache, const char *symbol) { PROC proc = NULL; diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c index 97b6045b7..c0069a20f 100644 --- a/xorg-server/hw/xwin/glx/indirect.c +++ b/xorg-server/hw/xwin/glx/indirect.c @@ -1626,15 +1626,15 @@ glxWinCreateContext(__GLXscreen * screen, */ static int -GetShift(int Mask) +GetShift(int mask) { - int Shift = 0; + int shift = 0; - while ((Mask &1) == 0) { - Shift++; - Mask >>=1; + while ((mask &1) == 0) { + shift++; + mask >>=1; } - return Shift; + return shift; } static int |