diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:39:48 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:39:48 +0200 |
| commit | 3a3a3373c36b5af6208ee5fdfe25e64b5766b75a (patch) | |
| tree | 619edfb91b22fe9e604b115b6f88616e942709f9 /nx-X11/programs/Xserver/hw/nxagent/NXshm.c | |
| parent | 796c8e421fd9df658fd5b324fcaa5182566e6905 (diff) | |
| parent | 085f8a4f672ed3e167bdd7791835f7ab2bebb723 (diff) | |
| download | nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.tar.gz nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.tar.bz2 nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.zip | |
Merge branch 'uli42-pr/various2' into 3.6.x
Attributes GH PR #827: https://github.com/ArcticaProject/nx-libs/pull/827
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXshm.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 9a314391c..e1b55f561 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -81,6 +81,8 @@ extern void fbPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pImage); +extern int nxagentImageLength(int, int, int, int, int); + void ShmExtensionInit(void) { @@ -228,7 +230,6 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) #ifdef NXAGENT_SERVER int length; char *newdata; - extern int nxagentImageLength(int, int, int, int, int); #ifdef TEST fprintf(stderr, "fbShmPutImage: Called with drawable at [%p] GC at [%p] data at [%p].\n", |