aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-05-01 11:43:14 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-11-02 11:18:00 +0100
commita9bdfd2171f74be3bfc6d1e4f1e22765f3bb54ff (patch)
tree4bb4baa2366f42dd648a26ab905f10dffda28f23 /nx-X11/programs/Xserver/Xext
parente755e660009f57f58ecf001c65b69e1bc0a29430 (diff)
downloadnx-libs-a9bdfd2171f74be3bfc6d1e4f1e22765f3bb54ff.tar.gz
nx-libs-a9bdfd2171f74be3bfc6d1e4f1e22765f3bb54ff.tar.bz2
nx-libs-a9bdfd2171f74be3bfc6d1e4f1e22765f3bb54ff.zip
NXshm.c: use upstream versions of Dispatch functions
instead of having an own (identical) copy
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
-rw-r--r--nx-X11/programs/Xserver/Xext/shm.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index 8e99b1047..afd5b7572 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -1138,9 +1138,12 @@ CreatePmap:
return (BadAlloc);
}
-#ifndef NXAGENT_SERVER
static int
+#ifdef NXAGENT_SERVER
+xorg_ProcShmDispatch (client)
+#else
ProcShmDispatch (client)
+#endif
register ClientPtr client;
{
REQUEST(xReq);
@@ -1174,7 +1177,6 @@ ProcShmDispatch (client)
return BadRequest;
}
}
-#endif /* NXAGENT_SERVER */
static void
SShmCompletionEvent(from, to)
@@ -1278,9 +1280,12 @@ SProcShmCreatePixmap(client)
return ProcShmCreatePixmap(client);
}
-#ifndef NXAGENT_SERVER
static int
+#ifdef NXAGENT_SERVER
+xorg_SProcShmDispatch (client)
+#else
SProcShmDispatch (client)
+#endif
register ClientPtr client;
{
REQUEST(xReq);
@@ -1302,4 +1307,3 @@ SProcShmDispatch (client)
return BadRequest;
}
}
-#endif /* NXAGENT_SERVER */