From 12130a4d9e41f37a1af9caaa95fb46fd284d03aa Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 18 Apr 2016 08:10:08 +0200
Subject: hw/nxagent/NXglyphcurs.c: Shrink file, drop duplicate code that can
 identically be found in dix/glyphcurs.c.

---
 nx-X11/programs/Xserver/dix/Imakefile   | 4 ++--
 nx-X11/programs/Xserver/dix/glyphcurs.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile
index f8a357e3e..da2f35eb1 100644
--- a/nx-X11/programs/Xserver/dix/Imakefile
+++ b/nx-X11/programs/Xserver/dix/Imakefile
@@ -16,11 +16,13 @@ FFS_OBJ = ffs.o
 #if (!(defined(NXAgentServer) && NXAgentServer))
 NXAGENT_SKIP_SRCS =                  \
                     extension.c      \
+                    glyphcurs.c      \
                     resource.c       \
                     window.c         \
                     $(NULL)
 NXAGENT_SKIP_OBJS =                  \
                     extension.o      \
+                    glyphcurs.o      \
                     resource.o       \
                     window.o         \
                     $(NULL)
@@ -37,7 +39,6 @@ SRCS =                          \
        events.c                 \
        gc.c                     \
        globals.c                \
-       glyphcurs.c              \
        grabs.c                  \
        main.c                   \
        property.c               \
@@ -63,7 +64,6 @@ OBJS =                          \
        events.o                 \
        gc.o                     \
        globals.o                \
-       glyphcurs.o              \
        grabs.o                  \
        main.o                   \
        property.o               \
diff --git a/nx-X11/programs/Xserver/dix/glyphcurs.c b/nx-X11/programs/Xserver/dix/glyphcurs.c
index 726297d96..f715a327f 100644
--- a/nx-X11/programs/Xserver/dix/glyphcurs.c
+++ b/nx-X11/programs/Xserver/dix/glyphcurs.c
@@ -74,6 +74,7 @@ the first one we find.
 cursor metrics.
 */
 
+#ifndef NXAGENT_SERVER
 int
 ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, unsigned char **ppbits)
 {
@@ -138,7 +139,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, uns
     (*pScreen->DestroyPixmap)(ppix);
     return Success;
 }
-
+#endif /* NXAGENT_SERVER */
 
 Bool
 CursorMetricsFromGlyph(register FontPtr pfont, unsigned ch, register CursorMetricPtr cm)
-- 
cgit v1.2.3