diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
| commit | edce25213ffc81389909c827c9aaac27b736b483 (patch) | |
| tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/dix/glyphcurs.c | |
| parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
| parent | 68dd0b52e13c844d662192654fb10cb993257a59 (diff) | |
| download | nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2 nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip | |
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/programs/Xserver/dix/glyphcurs.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/glyphcurs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/dix/glyphcurs.c b/nx-X11/programs/Xserver/dix/glyphcurs.c index 8f8adf5ce..726297d96 100644 --- a/nx-X11/programs/Xserver/dix/glyphcurs.c +++ b/nx-X11/programs/Xserver/dix/glyphcurs.c @@ -119,7 +119,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, uns /* fill the pixmap with 0 */ gcval[0].val = GXcopy; gcval[1].val = 0; - gcval[2].ptr = (pointer)pfont; + gcval[2].ptr = (void *)pfont; dixChangeGC(NullClient, pGC, GCFunction | GCForeground | GCFont, NULL, gcval); ValidateGC((DrawablePtr)ppix, pGC); |