diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-10 20:19:19 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-10 20:19:19 +0100 |
| commit | 320cece2e97035665d4df5e382ea45e5a7f07efa (patch) | |
| tree | e69e6342ece32a992ae29376697b4ecc691266de /nx-X11/programs/Xserver/xfixes | |
| parent | dc8477f76372e685eb999a71afb4e5ec7e3176f1 (diff) | |
| parent | ee2a933c3d4ad65849443cc917c59ad479083ca8 (diff) | |
| download | nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.tar.gz nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.tar.bz2 nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.zip | |
Merge branch 'uli42-pr/misc_cherries' into 3.6.x
Attributes GH PR #378: https://github.com/ArcticaProject/nx-libs/pull/378
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes')
| -rw-r--r-- | nx-X11/programs/Xserver/xfixes/cursor.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/cursor.c b/nx-X11/programs/Xserver/xfixes/cursor.c index 67f46f55e..441c4d0b2 100644 --- a/nx-X11/programs/Xserver/xfixes/cursor.c +++ b/nx-X11/programs/Xserver/xfixes/cursor.c @@ -390,7 +390,7 @@ ProcXFixesGetCursorName (ClientPtr client) CursorPtr pCursor; xXFixesGetCursorNameReply reply; REQUEST(xXFixesGetCursorNameReq); - char *str; + const char *str; int len; REQUEST_SIZE_MATCH(xXFixesGetCursorNameReq); @@ -437,7 +437,7 @@ ProcXFixesGetCursorImageAndName (ClientPtr client) CursorPtr pCursor; CARD32 *image; int npixels; - char *name; + const char *name; int nbytes, nbytesRound; int width, height; int x, y; @@ -641,7 +641,8 @@ SProcXFixesChangeCursor (ClientPtr client) static Bool TestForCursorName (CursorPtr pCursor, void * closure) { - return (pCursor->name == (Atom) closure); + Atom *pName = closure; + return (pCursor->name == *pName); } int @@ -657,7 +658,7 @@ ProcXFixesChangeCursorByName (ClientPtr client) tchar = (char *) &stuff[1]; name = MakeAtom (tchar, stuff->nbytes, FALSE); if (name) - ReplaceCursor (pSource, TestForCursorName, (void *) name); + ReplaceCursor (pSource, TestForCursorName, &name); return (client->noClientException); } |