From 500544f827c266f6a9c16d8669f62e54cdfd1f48 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 8 Apr 2016 09:38:20 +0200
Subject: hw/nxagent/NXmitrap.c: Shrink file, drop duplicate code that can
 identically be found in render/mitrap.c.

---
 nx-X11/programs/Xserver/render/Imakefile | 23 ++++++++++++++++++-----
 nx-X11/programs/Xserver/render/mitrap.c  |  2 ++
 2 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'nx-X11/programs/Xserver/render')

diff --git a/nx-X11/programs/Xserver/render/Imakefile b/nx-X11/programs/Xserver/render/Imakefile
index ff272ecbd..d6e2f4c40 100644
--- a/nx-X11/programs/Xserver/render/Imakefile
+++ b/nx-X11/programs/Xserver/render/Imakefile
@@ -1,6 +1,18 @@
 XCOMM $XFree86: xc/programs/Xserver/render/Imakefile,v 1.10 2002/11/23 02:38:15 keithp Exp $
+
+NULL =
+
 #include <Server.tmpl>
 
+#if (!(defined(NXAgentServer) && NXAgentServer))
+NXAGENT_SKIP_SRCS =             \
+                    mitrap.c    \
+                    $(NULL)
+NXAGENT_SKIP_OBJS =             \
+                    mitrap.o    \
+                    $(NULL)
+#endif
+
        SRCS =   animcur.c \
                 filter.c \
                 glyph.c \
@@ -9,11 +21,12 @@ XCOMM $XFree86: xc/programs/Xserver/render/Imakefile,v 1.10 2002/11/23 02:38:15
                 miindex.c \
                 mipict.c \
                 mirect.c \
-                mitrap.c \
                 mitri.c \
                 picture.c \
                 render.c \
-		renderedge.c
+                renderedge.c \
+                $(NXAGENT_SKIP_SRCS) \
+                $(NULL)
 
        OBJS =   animcur.o \
                 filter.o \
@@ -23,11 +36,12 @@ XCOMM $XFree86: xc/programs/Xserver/render/Imakefile,v 1.10 2002/11/23 02:38:15
                 miindex.o \
                 mipict.o \
                 mirect.o \
-                mitrap.o \
                 mitri.o \
                 picture.o \
                 render.o \
-		renderedge.o
+                renderedge.o \
+                $(NXAGENT_SKIP_OBJS) \
+                $(NULL)
 
    INCLUDES = -I. -I../include -I../mi \
                 -I../fb -I../hw/kdrive -I$(EXTINCSRC) -I$(XINCLUDESRC) \
@@ -46,4 +60,3 @@ InstallDriverSDKNonExecFile(glyphstr.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(mipict.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(picture.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(picturestr.h,$(DRIVERSDKINCLUDEDIR))
-
diff --git a/nx-X11/programs/Xserver/render/mitrap.c b/nx-X11/programs/Xserver/render/mitrap.c
index be1712420..96f1159a4 100644
--- a/nx-X11/programs/Xserver/render/mitrap.c
+++ b/nx-X11/programs/Xserver/render/mitrap.c
@@ -128,6 +128,7 @@ miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box)
     }
 }
 
+#ifndef NXAGENT_SERVER
 void
 miTrapezoids (CARD8	    op,
 	      PicturePtr    pSrc,
@@ -188,3 +189,4 @@ miTrapezoids (CARD8	    op,
 	    miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
     }
 }
+#endif
-- 
cgit v1.2.3