diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-02-03 14:46:20 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-02-03 14:46:20 +0100 |
| commit | 770f468cd56cdd4c82bf4973a3505a3e8e4f01b4 (patch) | |
| tree | ecdf41f1034fd1a851265d903be367875846fb1e /nx-X11/programs/Xserver/dix | |
| parent | e5746df802eff5c50e46ef5ee96b3f0e34a00003 (diff) | |
| parent | cbd9875e5ca3169d5aaa995e73ec1f67f29ca743 (diff) | |
| download | nx-libs-770f468cd56cdd4c82bf4973a3505a3e8e4f01b4.tar.gz nx-libs-770f468cd56cdd4c82bf4973a3505a3e8e4f01b4.tar.bz2 nx-libs-770f468cd56cdd4c82bf4973a3505a3e8e4f01b4.zip | |
Merge branch 'uli42-pr/windowfixes' into 3.6.x
Attributes GH PR #994: https://github.com/ArcticaProject/nx-libs/pull/994
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/property.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c index f0bfe1e65..37af8d592 100644 --- a/nx-X11/programs/Xserver/dix/property.c +++ b/nx-X11/programs/Xserver/dix/property.c @@ -661,9 +661,12 @@ ProcListProperties(ClientPtr client) return(client->noClientException); } -#ifndef NXAGENT_SERVER int +#ifdef NXAGENT_SERVER +xorg_ProcDeleteProperty(register ClientPtr client) +#else ProcDeleteProperty(register ClientPtr client) +#endif { WindowPtr pWin; REQUEST(xDeletePropertyReq); @@ -699,4 +702,3 @@ ProcDeleteProperty(register ClientPtr client) else return(result); } -#endif |