aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-04-11 14:53:15 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-25 00:53:09 +0200
commitc6f86b3b2f0862edb95a46c6955876efe10e20f9 (patch)
treec8cf109eb91f1fb03e5b1256b0f30f170d8d69ec /nx-X11/programs/Xserver/Xext
parent51e4ed0fccc10248711562968f3c54e450a5eb5a (diff)
downloadnx-libs-c6f86b3b2f0862edb95a46c6955876efe10e20f9.tar.gz
nx-libs-c6f86b3b2f0862edb95a46c6955876efe10e20f9.tar.bz2
nx-libs-c6f86b3b2f0862edb95a46c6955876efe10e20f9.zip
hw/nxagent/NXshm.c: Shrink file, drop duplicate code that can identically be found in Xext/shm.c.
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
-rw-r--r--nx-X11/programs/Xserver/Xext/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/Xext/shm.c13
2 files changed, 13 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile
index 971d624e1..f4add461e 100644
--- a/nx-X11/programs/Xserver/Xext/Imakefile
+++ b/nx-X11/programs/Xserver/Xext/Imakefile
@@ -30,7 +30,7 @@ XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.43 2003/04/21 18:56:48 sv
SUBDIRS = extmod
#endif
-#if HasShm
+#if HasShm && (!(defined(NXAgentServer) && NXAgentServer))
SHMSRCS = shm.c
SHMOBJS = shm.o
#endif
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index 6378a55a4..94d6b4ac1 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -202,6 +202,7 @@ static Bool CheckForShmSyscall()
#endif
+#ifndef NXAGENT_SERVER
void
ShmExtensionInit(INITARGS)
{
@@ -265,6 +266,7 @@ ShmExtensionInit(INITARGS)
EventSwapVector[ShmCompletionCode] = (EventSwapPtr) SShmCompletionEvent;
}
}
+#endif /* NXAGENT_SERVER */
/*ARGSUSED*/
static void
@@ -502,6 +504,7 @@ ProcShmDetach(client)
return(client->noClientException);
}
+#ifndef NXAGENT_SERVER
static void
miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
DrawablePtr dst;
@@ -563,6 +566,7 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy,
data);
}
+#endif /* NXAGENT_SERVER */
#ifdef PANORAMIX
@@ -824,6 +828,7 @@ CreatePmap:
#endif
+#ifndef NXAGENT_SERVER
static int
ProcShmPutImage(client)
register ClientPtr client;
@@ -934,7 +939,7 @@ ProcShmPutImage(client)
return (client->noClientException);
}
-
+#endif /* NXAGENT_SERVER */
static int
@@ -1047,6 +1052,7 @@ ProcShmGetImage(client)
return(client->noClientException);
}
+#ifndef NXAGENT_SERVER
static PixmapPtr
fbShmCreatePixmap (pScreen, width, height, depth, addr)
ScreenPtr pScreen;
@@ -1068,6 +1074,7 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr)
}
return pPixmap;
}
+#endif /* NXAGENT_SERVER */
static int
ProcShmCreatePixmap(client)
@@ -1142,6 +1149,7 @@ CreatePmap:
return (BadAlloc);
}
+#ifndef NXAGENT_SERVER
static int
ProcShmDispatch (client)
register ClientPtr client;
@@ -1177,6 +1185,7 @@ ProcShmDispatch (client)
return BadRequest;
}
}
+#endif /* NXAGENT_SERVER */
static void
SShmCompletionEvent(from, to)
@@ -1286,6 +1295,7 @@ SProcShmCreatePixmap(client)
return ProcShmCreatePixmap(client);
}
+#ifndef NXAGENT_SERVER
static int
SProcShmDispatch (client)
register ClientPtr client;
@@ -1309,3 +1319,4 @@ SProcShmDispatch (client)
return BadRequest;
}
}
+#endif /* NXAGENT_SERVER */ \ No newline at end of file