diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-08 09:45:32 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-25 00:39:26 +0200 |
| commit | ae1a218d16b65194c522ef8ffc998184863321f9 (patch) | |
| tree | 381a7376a03c7b586de0ae68ba9672fad6ddd222 /nx-X11/programs/Xserver/render | |
| parent | 500544f827c266f6a9c16d8669f62e54cdfd1f48 (diff) | |
| download | nx-libs-ae1a218d16b65194c522ef8ffc998184863321f9.tar.gz nx-libs-ae1a218d16b65194c522ef8ffc998184863321f9.tar.bz2 nx-libs-ae1a218d16b65194c522ef8ffc998184863321f9.zip | |
hw/nxagent/NXmiglyph.c: Shrink file, drop code that can be identically found in render/miglyph.c.
Diffstat (limited to 'nx-X11/programs/Xserver/render')
| -rw-r--r-- | nx-X11/programs/Xserver/render/Imakefile | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/render/miglyph.c | 2 |
2 files changed, 4 insertions, 2 deletions
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 |