diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
| commit | 975511c875674f097bbd2be33fa947a48d8c77c6 (patch) | |
| tree | 207bba2c48054f551f19ed5aa89b9dd9616b8c60 /nx-X11/programs/Xserver/Xext/xvdisp.c | |
| parent | 9df153668423af868d0df739188a772fbc3356c6 (diff) | |
| parent | a5befd4e20813910022ed771cb599f15bbf4664d (diff) | |
| download | nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.gz nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.bz2 nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.zip | |
Merge branch 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xserver-code-and-include-in-nxagent' into arctica-3.6.x
Attributes GH PR #120: https://github.com/ArcticaProject/nx-libs/pull/120
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/xvdisp.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xvdisp.c | 4 |
1 files changed, 4 insertions, 0 deletions
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) |