diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-10 01:57:57 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-25 00:53:09 +0200 |
| commit | 51e4ed0fccc10248711562968f3c54e450a5eb5a (patch) | |
| tree | 2c47521db4d233634eb904d50ac7ee1f5abc7c4b /nx-X11/programs/Xserver/Xext | |
| parent | add881931f2e702fb1952f4e1baba04b3dc536ee (diff) | |
| download | nx-libs-51e4ed0fccc10248711562968f3c54e450a5eb5a.tar.gz nx-libs-51e4ed0fccc10248711562968f3c54e450a5eb5a.tar.bz2 nx-libs-51e4ed0fccc10248711562968f3c54e450a5eb5a.zip | |
hw/nxagent/NXxvdisp.c: Shrink file, drop duplicate code that can identically be found in Xext/xvdisp.c.
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 | 4 |
2 files changed, 8 insertions, 1 deletions
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) |