diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
| commit | 975511c875674f097bbd2be33fa947a48d8c77c6 (patch) | |
| tree | 207bba2c48054f551f19ed5aa89b9dd9616b8c60 /nx-X11/programs/Xserver/dix/glyphcurs.c | |
| parent | 9df153668423af868d0df739188a772fbc3356c6 (diff) | |
| parent | a5befd4e20813910022ed771cb599f15bbf4664d (diff) | |
| download | nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.gz nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.bz2 nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.zip | |
Merge branch 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xserver-code-and-include-in-nxagent' into arctica-3.6.x
Attributes GH PR #120: https://github.com/ArcticaProject/nx-libs/pull/120
Diffstat (limited to 'nx-X11/programs/Xserver/dix/glyphcurs.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/glyphcurs.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) |