diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-18 08:10:08 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-25 00:39:27 +0200 |
| commit | 12130a4d9e41f37a1af9caaa95fb46fd284d03aa (patch) | |
| tree | 63d3109b194210236b9e938b20fe86062c6ddb28 /nx-X11/programs/Xserver/dix | |
| parent | a648558796042b0cdb1a373f52bf8a4ca2dbea87 (diff) | |
| download | nx-libs-12130a4d9e41f37a1af9caaa95fb46fd284d03aa.tar.gz nx-libs-12130a4d9e41f37a1af9caaa95fb46fd284d03aa.tar.bz2 nx-libs-12130a4d9e41f37a1af9caaa95fb46fd284d03aa.zip | |
hw/nxagent/NXglyphcurs.c: Shrink file, drop duplicate code that can identically be found in dix/glyphcurs.c.
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/Imakefile | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/glyphcurs.c | 3 |
2 files changed, 4 insertions, 3 deletions
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) |