diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:18:39 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:18:39 +0100 |
| commit | d6872d4e01df9a7e329524ea311512a9cf34da3b (patch) | |
| tree | ae285606cc0dd1ad0137f636c8649fa4845fa226 /nx-X11/programs/Xserver/Xext/shm.c | |
| parent | 7afe95535b10739d806e5d7c15a8a1e86093bf84 (diff) | |
| parent | 6fd0ffc99890c413d003bef323024f0cee62916f (diff) | |
| download | nx-libs-d6872d4e01df9a7e329524ea311512a9cf34da3b.tar.gz nx-libs-d6872d4e01df9a7e329524ea311512a9cf34da3b.tar.bz2 nx-libs-d6872d4e01df9a7e329524ea311512a9cf34da3b.zip | |
Merge branch 'uli42-pr/simplify_nxshm' into 3.6.x
Attributes GH PR #859: https://github.com/ArcticaProject/nx-libs/pull/859
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/shm.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/shm.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index 8e99b1047..868087462 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -490,9 +490,12 @@ ProcShmDetach(client) return(client->noClientException); } -#ifndef NXAGENT_SERVER static void +#ifdef NXAGENT_SERVER +xorg_miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) +#else miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) +#endif DrawablePtr dst; GCPtr pGC; int depth, w, h, sx, sy, sw, sh, dx, dy; @@ -525,6 +528,7 @@ miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) (*pmap->drawable.pScreen->DestroyPixmap)(pmap); } +#ifndef NXAGENT_SERVER static void fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) DrawablePtr dst; @@ -1138,9 +1142,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 +1181,6 @@ ProcShmDispatch (client) return BadRequest; } } -#endif /* NXAGENT_SERVER */ static void SShmCompletionEvent(from, to) @@ -1278,9 +1284,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 +1311,3 @@ SProcShmDispatch (client) return BadRequest; } } -#endif /* NXAGENT_SERVER */ |