diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-05-01 02:35:56 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:33:16 +0100 |
| commit | 280cf1264f177355e6087d09fb6b6f4fa32b3c36 (patch) | |
| tree | df86356f9baa450b13cf7b7e89c77328dee382bb /nx-X11/programs/Xserver/Xext | |
| parent | fdd1e538bcc6297e2e387e364fedd3ab62512f30 (diff) | |
| download | nx-libs-280cf1264f177355e6087d09fb6b6f4fa32b3c36.tar.gz nx-libs-280cf1264f177355e6087d09fb6b6f4fa32b3c36.tar.bz2 nx-libs-280cf1264f177355e6087d09fb6b6f4fa32b3c36.zip | |
Simplify (NX)xvdisp.c
NXxvdisp.c only exists to set/unset nxagentXvTrap before/after
dispatch. There's no need to duplicate the original code. We now
rename the original dispatch functions and call them in our dispatch
code.
Also drop check for sun and cygwin, as they never appeared in xorg
upstream code.
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/Imakefile | 5 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xvdisp.c | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile index 8262f667d..8198e302c 100644 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ b/nx-X11/programs/Xserver/Xext/Imakefile @@ -43,10 +43,7 @@ XF86BIGFOBJS = xf86bigfont.o #endif #endif -#if BuildXvExt && ( (defined(NXAgentServer) && NXAgentServer) && !defined(SunArchitecture) && !defined(cygwinArchitecture) ) - XVSRCS = xvmain.c xvmc.c - XVOBJS = xvmain.o xvmc.o -#elif BuildXvExt +#if BuildXvExt XVSRCS = xvmain.c xvdisp.c xvmc.c XVOBJS = xvmain.o xvdisp.o xvmc.o #endif diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c index 54ab4ac48..60239b5e3 100644 --- a/nx-X11/programs/Xserver/Xext/xvdisp.c +++ b/nx-X11/programs/Xserver/Xext/xvdisp.c @@ -224,10 +224,12 @@ static int SWriteImageFormatInfo(ClientPtr, xvImageFormatInfo*); ** */ -#if !defined(NXAGENT_SERVER) || defined(__sun) || defined(__CYGWIN__) - int +#ifdef NXAGENT_SERVER +xorg_ProcXvDispatch(ClientPtr client) +#else ProcXvDispatch(ClientPtr client) +#endif { REQUEST(xReq); @@ -309,7 +311,11 @@ ProcXvDispatch(ClientPtr client) } int +#ifdef NXAGENT_SERVER +xorg_SProcXvDispatch(ClientPtr client) +#else SProcXvDispatch(ClientPtr client) +#endif { REQUEST(xReq); @@ -353,7 +359,6 @@ SProcXvDispatch(ClientPtr client) } } } -#endif /* !defined(NXAGENT_SERVER) || defined(__sun) || defined(__CYGWIN__) */ static int |