aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-10-18 00:22:53 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-11-17 13:10:29 +0100
commitac66ba34990568b03526574f7e0d320f6b5f780a (patch)
treedc0540d2594ca2e1e5ad691adbef9c9c9cc8827c /nx-X11/programs
parentfff0d54733b016f225eb767b3d755c06295ac806 (diff)
downloadnx-libs-ac66ba34990568b03526574f7e0d320f6b5f780a.tar.gz
nx-libs-ac66ba34990568b03526574f7e0d320f6b5f780a.tar.bz2
nx-libs-ac66ba34990568b03526574f7e0d320f6b5f780a.zip
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.
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXglxext.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
index f94473be0..9d0f4f719 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
@@ -57,12 +57,11 @@
*/
static int __glXDispatch(ClientPtr client)
{
- int result;
-
REQUEST(xGLXSingleReq);
CARD8 opcode;
int (*proc)(__GLXclientState *cl, GLbyte *pc);
__GLXclientState *cl;
+ int retval;
opcode = stuff->glxCode;
cl = __glXClients[client->index];
@@ -124,7 +123,7 @@ static int __glXDispatch(ClientPtr client)
opcode, client -> index);
#endif
- result = (*proc)(cl, (GLbyte *) stuff);
+ retval = (*proc)(cl, (GLbyte *) stuff);
nxagentGlxTrap = 0;
@@ -133,5 +132,5 @@ static int __glXDispatch(ClientPtr client)
opcode, client -> index);
#endif
- return result;
+ return retval;
}