diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:39:48 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:39:48 +0200 |
| commit | 3a3a3373c36b5af6208ee5fdfe25e64b5766b75a (patch) | |
| tree | 619edfb91b22fe9e604b115b6f88616e942709f9 /nx-X11/programs/Xserver/dix/property.c | |
| parent | 796c8e421fd9df658fd5b324fcaa5182566e6905 (diff) | |
| parent | 085f8a4f672ed3e167bdd7791835f7ab2bebb723 (diff) | |
| download | nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.tar.gz nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.tar.bz2 nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.zip | |
Merge branch 'uli42-pr/various2' into 3.6.x
Attributes GH PR #827: https://github.com/ArcticaProject/nx-libs/pull/827
Diffstat (limited to 'nx-X11/programs/Xserver/dix/property.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/property.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c index 66c38f56c..7f25a5c55 100644 --- a/nx-X11/programs/Xserver/dix/property.c +++ b/nx-X11/programs/Xserver/dix/property.c @@ -655,6 +655,7 @@ ProcListProperties(ClientPtr client) return(client->noClientException); } +#ifndef NXAGENT_SERVER int ProcDeleteProperty(register ClientPtr client) { @@ -692,3 +693,4 @@ ProcDeleteProperty(register ClientPtr client) else return(result); } +#endif |