From ae1a218d16b65194c522ef8ffc998184863321f9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 8 Apr 2016 09:45:32 +0200
Subject: hw/nxagent/NXmiglyph.c: Shrink file, drop code that can be
 identically found in render/miglyph.c.

---
 nx-X11/programs/Xserver/render/Imakefile | 4 ++--
 nx-X11/programs/Xserver/render/miglyph.c | 2 ++
 2 files changed, 4 insertions(+), 2 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 d6e2f4c40..0685ef3f6 100644
--- a/nx-X11/programs/Xserver/render/Imakefile
+++ b/nx-X11/programs/Xserver/render/Imakefile
@@ -6,9 +6,11 @@ NULL =
 
 #if (!(defined(NXAgentServer) && NXAgentServer))
 NXAGENT_SKIP_SRCS =             \
+                    miglyph.c   \
                     mitrap.c    \
                     $(NULL)
 NXAGENT_SKIP_OBJS =             \
+                    miglyph.o   \
                     mitrap.o    \
                     $(NULL)
 #endif
@@ -17,7 +19,6 @@ NXAGENT_SKIP_OBJS =             \
                 filter.c \
                 glyph.c \
                 matrix.c \
-                miglyph.c \
                 miindex.c \
                 mipict.c \
                 mirect.c \
@@ -32,7 +33,6 @@ NXAGENT_SKIP_OBJS =             \
                 filter.o \
                 glyph.o \
                 matrix.o \
-                miglyph.o \
                 miindex.o \
                 mipict.o \
                 mirect.o \
diff --git a/nx-X11/programs/Xserver/render/miglyph.c b/nx-X11/programs/Xserver/render/miglyph.c
index 8b046bd46..f169c3bb7 100644
--- a/nx-X11/programs/Xserver/render/miglyph.c
+++ b/nx-X11/programs/Xserver/render/miglyph.c
@@ -89,6 +89,7 @@ miGlyphExtents (int		nlist,
 
 #define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0)
 
+#ifndef NXAGENT_SERVER
 void
 miGlyphs (CARD8		op,
 	  PicturePtr	pSrc,
@@ -241,3 +242,4 @@ miGlyphs (CARD8		op,
 	(*pScreen->DestroyPixmap) (pMaskPixmap);
     }
 }
+#endif
-- 
cgit v1.2.3