From 51e4ed0fccc10248711562968f3c54e450a5eb5a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 10 Apr 2016 01:57:57 +0200 Subject: hw/nxagent/NXxvdisp.c: Shrink file, drop duplicate code that can identically be found in Xext/xvdisp.c. --- nx-X11/programs/Xserver/Xext/Imakefile | 5 ++++- nx-X11/programs/Xserver/Xext/xvdisp.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/Xext') diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile index 2c9798639..971d624e1 100644 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ b/nx-X11/programs/Xserver/Xext/Imakefile @@ -48,7 +48,10 @@ XF86BIGFOBJS = xf86bigfont.o #endif #endif -#if BuildXvExt +#if BuildXvExt && ( (defined(NXAgentServer) && NXAgentServer) && !defined(SunArchitecture) && !defined(cygwinArchitecture) ) + XVSRCS = xvmain.c xvmc.c + XVOBJS = xvmain.o xvmc.o +#elif 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 8037e6c45..ecd4f9a66 100644 --- a/nx-X11/programs/Xserver/Xext/xvdisp.c +++ b/nx-X11/programs/Xserver/Xext/xvdisp.c @@ -224,6 +224,8 @@ static int SWriteImageFormatInfo(ClientPtr, xvImageFormatInfo*); ** */ +#if !defined(NXAGENT_SERVER) || defined(__sun) || defined(__CYGWIN__) + int ProcXvDispatch(ClientPtr client) { @@ -351,6 +353,8 @@ SProcXvDispatch(ClientPtr client) } } } +#endif /* !defined(NXAGENT_SERVER) || defined(__sun) || defined(__CYGWIN__) */ + static int ProcXvQueryExtension(ClientPtr client) -- cgit v1.2.3