diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-05-30 23:24:16 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:18:00 +0100 |
| commit | 6fd0ffc99890c413d003bef323024f0cee62916f (patch) | |
| tree | ae285606cc0dd1ad0137f636c8649fa4845fa226 /nx-X11/programs/Xserver/Xext | |
| parent | a9bdfd2171f74be3bfc6d1e4f1e22765f3bb54ff (diff) | |
| download | nx-libs-6fd0ffc99890c413d003bef323024f0cee62916f.tar.gz nx-libs-6fd0ffc99890c413d003bef323024f0cee62916f.tar.bz2 nx-libs-6fd0ffc99890c413d003bef323024f0cee62916f.zip | |
NXshm.c: call upstream miShmPutImage
instead of having an identical copy in nxagent_miShmPutImage
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/shm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index afd5b7572..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; |