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/cursor.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/cursor.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/cursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/cursor.c b/nx-X11/programs/Xserver/dix/cursor.c index f4d6c6419..187dd62c5 100644 --- a/nx-X11/programs/Xserver/dix/cursor.c +++ b/nx-X11/programs/Xserver/dix/cursor.c @@ -110,7 +110,7 @@ FreeCursorBits(CursorBitsPtr bits) * \param value must conform to DeleteType */ int -FreeCursor(pointer value, XID cid) +FreeCursor(void * value, XID cid) { int nscr; CursorPtr pCurs = (CursorPtr)value; @@ -452,7 +452,7 @@ CreateRootCursor(char *pfilename, unsigned glyph) 0, 0, 0, ~0, ~0, ~0, &curs, serverClient) != Success) return NullCursor; - if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer)curs)) + if (!AddResource(FakeClientID(0), RT_CURSOR, (void *)curs)) return NullCursor; return curs; |