From 280cf1264f177355e6087d09fb6b6f4fa32b3c36 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 1 May 2019 02:35:56 +0200 Subject: 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. --- nx-X11/programs/Xserver/Xext/xvdisp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/Xext/xvdisp.c') 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 -- cgit v1.2.3