Skip to content

N
nx-libs
Commit ac66ba34 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

NXglxext.c: rename and relocate variable

This change make the code more similar to upstream Xorg which helps when merging in changes from later Xorg releases.
parent fff0d547
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
View file @ ac66ba34
...@@ -57,12 +57,11 @@ ...@@ -57,12 +57,11 @@
*/ */
static int __glXDispatch(ClientPtr client) static int __glXDispatch(ClientPtr client)
{ {
int result;
REQUEST(xGLXSingleReq); REQUEST(xGLXSingleReq);
CARD8 opcode; CARD8 opcode;
int (*proc)(__GLXclientState *cl, GLbyte *pc); int (*proc)(__GLXclientState *cl, GLbyte *pc);
__GLXclientState *cl; __GLXclientState *cl;
int retval;
opcode = stuff->glxCode; opcode = stuff->glxCode;
cl = __glXClients[client->index]; cl = __glXClients[client->index];
...@@ -124,7 +123,7 @@ static int __glXDispatch(ClientPtr client) ...@@ -124,7 +123,7 @@ static int __glXDispatch(ClientPtr client)
opcode, client -> index); opcode, client -> index);
#endif #endif
result = (*proc)(cl, (GLbyte *) stuff); retval = (*proc)(cl, (GLbyte *) stuff);
nxagentGlxTrap = 0; nxagentGlxTrap = 0;
...@@ -133,5 +132,5 @@ static int __glXDispatch(ClientPtr client) ...@@ -133,5 +132,5 @@ static int __glXDispatch(ClientPtr client)
opcode, client -> index); opcode, client -> index);
#endif #endif
return result; return retval;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment