diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:49:57 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:49:57 +0100 |
| commit | 1ae0ceb7cf79b6b7b268a0f0d4935fd235f990d3 (patch) | |
| tree | be72db598a67613d9ca4cb37e900e09a55ba0ca5 /nx-X11/programs/Xserver/GL | |
| parent | eb8c16ef9d24add2e0912269775d586d7d4061e4 (diff) | |
| parent | f3bddad4c69bc83f68b5f1118cb37752593b8c57 (diff) | |
| download | nx-libs-1ae0ceb7cf79b6b7b268a0f0d4935fd235f990d3.tar.gz nx-libs-1ae0ceb7cf79b6b7b268a0f0d4935fd235f990d3.tar.bz2 nx-libs-1ae0ceb7cf79b6b7b268a0f0d4935fd235f990d3.zip | |
Merge branch 'uli42-pr/simplify_glxext' into 3.6.x
Attributes GH PR #868: https://github.com/ArcticaProject/nx-libs/pull/868
Diffstat (limited to 'nx-X11/programs/Xserver/GL')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/glxext.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/glxext.c b/nx-X11/programs/Xserver/GL/glx/glxext.c index 4f2d2082d..328b0a3cf 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxext.c +++ b/nx-X11/programs/Xserver/GL/glx/glxext.c @@ -387,12 +387,15 @@ __GLXcontext *__glXForceCurrent(__GLXclientState *cl, GLXContextTag tag, /************************************************************************/ -#ifndef NXAGENT_SERVER /* ** Top level dispatcher; all commands are executed from here down. */ +#ifdef NXAGENT_SERVER +static int xorg__glXDispatch(ClientPtr client) +#else static int __glXDispatch(ClientPtr client) +#endif { REQUEST(xGLXSingleReq); CARD8 opcode; @@ -449,8 +452,6 @@ static int __glXDispatch(ClientPtr client) return (*proc)(cl, (GLbyte *) stuff); } -#endif /* NXAGENT_SERVER */ - int __glXNoSuchSingleOpcode(__GLXclientState *cl, GLbyte *pc) { |