From 0571ece6a4ea66b4d558b3f6d0dc1d81b47c799b Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 18 Apr 2016 08:19:05 +0200
Subject: hw/nxagent/NXglyph.c: Shrink file, drop duplicate code that can
 identically be found in render/glyph.c.

---
 nx-X11/programs/Xserver/render/Imakefile | 2 ++
 nx-X11/programs/Xserver/render/glyph.c   | 7 +++++++
 2 files changed, 9 insertions(+)

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

diff --git a/nx-X11/programs/Xserver/render/Imakefile b/nx-X11/programs/Xserver/render/Imakefile
index a8eab5149..2d918458b 100644
--- a/nx-X11/programs/Xserver/render/Imakefile
+++ b/nx-X11/programs/Xserver/render/Imakefile
@@ -6,12 +6,14 @@ NULL =
 
 #if (!(defined(NXAgentServer) && NXAgentServer))
 NXAGENT_SKIP_SRCS =             \
+                    glyph.c     \
                     miglyph.c   \
                     mitrap.c    \
                     picture.c   \
                     render.c    \
                     $(NULL)
 NXAGENT_SKIP_OBJS =             \
+                    glyph.o     \
                     miglyph.o   \
                     mitrap.o    \
                     picture.o   \
diff --git a/nx-X11/programs/Xserver/render/glyph.c b/nx-X11/programs/Xserver/render/glyph.c
index f15b199b5..854a9069d 100644
--- a/nx-X11/programs/Xserver/render/glyph.c
+++ b/nx-X11/programs/Xserver/render/glyph.c
@@ -268,6 +268,7 @@ FreeGlyph (GlyphPtr glyph, int format)
     }
 }
 
+#ifndef NXAGENT_SERVER
 void
 AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id)
 {
@@ -301,6 +302,7 @@ AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id)
     gr->signature = id;
     CheckDuplicates (&globalGlyphs[glyphSet->fdepth], "AddGlyph bottom");
 }
+#endif /* NXAGENT_SERVER */
 
 Bool
 DeleteGlyph (GlyphSetPtr glyphSet, Glyph id)
@@ -320,6 +322,7 @@ DeleteGlyph (GlyphSetPtr glyphSet, Glyph id)
     return FALSE;
 }
 
+#ifndef NXAGENT_SERVER
 GlyphPtr
 FindGlyph (GlyphSetPtr glyphSet, Glyph id)
 {
@@ -330,6 +333,7 @@ FindGlyph (GlyphSetPtr glyphSet, Glyph id)
 	glyph = 0;
     return glyph;
 }
+#endif /* NXAGENT_SERVER */
 
 GlyphPtr
 AllocateGlyph (xGlyphInfo *gi, int fdepth)
@@ -363,6 +367,8 @@ AllocateGlyphHash (GlyphHashPtr hash, GlyphHashSetPtr hashSet)
     return TRUE;
 }
 
+
+#ifndef NXAGENT_SERVER
 Bool
 ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global)
 {
@@ -405,6 +411,7 @@ ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global)
 	CheckDuplicates (hash, "ResizeGlyphHash bottom");
     return TRUE;
 }
+#endif /* NXAGENT_SERVER */
 
 Bool
 ResizeGlyphSet (GlyphSetPtr glyphSet, CARD32 change)
-- 
cgit v1.2.3