diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-07 12:22:51 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-25 00:39:26 +0200 |
| commit | 148f750678eba0208341bb6aded9c2a766acccd3 (patch) | |
| tree | 70096997853d24b13f1830eb9732fc516001d729 /nx-X11/programs/Xserver/miext | |
| parent | fd31518f4652ddb1c8aac9aef167a4b8bc1e76e4 (diff) | |
| download | nx-libs-148f750678eba0208341bb6aded9c2a766acccd3.tar.gz nx-libs-148f750678eba0208341bb6aded9c2a766acccd3.tar.bz2 nx-libs-148f750678eba0208341bb6aded9c2a766acccd3.zip | |
hw/nxagent/NXdamage.c: Shrink file, drop duplicate code that can identically be found in miext/damage/damage.c.
Diffstat (limited to 'nx-X11/programs/Xserver/miext')
| -rwxr-xr-x | nx-X11/programs/Xserver/miext/damage/Imakefile | 2 | ||||
| -rwxr-xr-x | nx-X11/programs/Xserver/miext/damage/damage.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/miext/damage/Imakefile b/nx-X11/programs/Xserver/miext/damage/Imakefile index a28786203..34d3fcf5a 100755 --- a/nx-X11/programs/Xserver/miext/damage/Imakefile +++ b/nx-X11/programs/Xserver/miext/damage/Imakefile @@ -5,6 +5,7 @@ DEFINES = -DROOTLESS_WORKAROUND #endif +#if (!(defined(NXAgentServer) && NXAgentServer)) SRCS = damage.c OBJS = damage.o @@ -21,6 +22,7 @@ NormalLibraryTarget(damage,$(OBJS)) LintLibraryTarget(damage,$(SRCS)) NormalLintTarget($(SRCS)) +#endif DependTarget() diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c index 60e2ae4b5..f28d95820 100755 --- a/nx-X11/programs/Xserver/miext/damage/damage.c +++ b/nx-X11/programs/Xserver/miext/damage/damage.c @@ -1324,6 +1324,8 @@ damageDamageChars (DrawablePtr pDrawable, #define TT_POLY16 2 #define TT_IMAGE16 3 +#ifndef NXAGENT_SERVER + static int damageText (DrawablePtr pDrawable, GCPtr pGC, @@ -1445,6 +1447,7 @@ damageImageText16(DrawablePtr pDrawable, DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } +#endif /* NXAGENT_SERVER */ static void damageImageGlyphBlt(DrawablePtr pDrawable, |