xserver: Branch 'master'

[Eamon Walsh]

 xfixes/cursor.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 019ad5acd20e34dc2aa3b89cc426138db5164c48
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Tue Feb 5 15:44:41 2008 -0500

    XFixes: squash a pointer/integer size mismatch warning.

diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 1d122fa..d51251f 100755
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -707,7 +707,8 @@ SProcXFixesChangeCursor (ClientPtr client)
 static Bool
 TestForCursorName (CursorPtr pCursor, pointer closure)
 {
-    return (pCursor->name == (Atom) closure);
+    Atom *pName = closure;
+    return (pCursor->name == *pName);
 }
 
 int
@@ -724,7 +725,7 @@ ProcXFixesChangeCursorByName (ClientPtr client)
     tchar = (char *) &stuff[1];
     name = MakeAtom (tchar, stuff->nbytes, FALSE);
     if (name)
-	ReplaceCursor (pSource, TestForCursorName, (pointer) name);
+	ReplaceCursor (pSource, TestForCursorName, &name);
     return (client->noClientException);
 }