From a9bdfd2171f74be3bfc6d1e4f1e22765f3bb54ff Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 1 May 2019 11:43:14 +0200 Subject: NXshm.c: use upstream versions of Dispatch functions instead of having an own (identical) copy --- nx-X11/programs/Xserver/Xext/shm.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/Xext/shm.c') 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 */ -- cgit v1.2.3