From ac66ba34990568b03526574f7e0d320f6b5f780a Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 18 Oct 2017 00:22:53 +0200 Subject: 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. --- nx-X11/programs/Xserver/hw/nxagent/NXglxext.c | 7 +++---- 1 file 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; } -- cgit v1.2.3