diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:34:00 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:34:00 +0100 |
| commit | 03d31d2ab37548dffa2bc9f70608cdcc67b09d97 (patch) | |
| tree | df86356f9baa450b13cf7b7e89c77328dee382bb /nx-X11/programs/Xserver/Xext | |
| parent | fdd1e538bcc6297e2e387e364fedd3ab62512f30 (diff) | |
| parent | 280cf1264f177355e6087d09fb6b6f4fa32b3c36 (diff) | |
| download | nx-libs-03d31d2ab37548dffa2bc9f70608cdcc67b09d97.tar.gz nx-libs-03d31d2ab37548dffa2bc9f70608cdcc67b09d97.tar.bz2 nx-libs-03d31d2ab37548dffa2bc9f70608cdcc67b09d97.zip | |
Merge branch 'uli42-pr/simplify_nxxvdisp' into 3.6.x
Attributes GH PR #864: https://github.com/ArcticaProject/nx-libs/pull/864
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 |