mesa xkeyboard-config xserver git update 15 jan 2014

xserver          commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa             commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43

1 files changed, 3 insertions, 3 deletions

diff --git a/xorg-server/mi/midispcur.c b/xorg-server/mi/midispcur.c
index edca9696f..8cca5fe6e 100644
--- a/xorg-server/mi/midispcur.c
+++ b/xorg-server/mi/midispcur.c
@@ -79,7 +79,7 @@ typedef struct {
   (miDCBufferPtr)dixLookupScreenPrivate(&GetMaster(dev, MASTER_POINTER)->devPrivates, miDCDeviceKey, screen))
 
 /* 
- * The core pointer buffer will point to the index of the virtual core pointer
+ * The core pointer buffer will point to the index of the virtual pointer
  * in the pCursorBuffers array. 
  */
 typedef struct {
@@ -114,7 +114,7 @@ miDCInitialize(ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs)
     dixSetPrivate(&pScreen->devPrivates, miDCScreenKey, pScreenPriv);
 
     if (!miSpriteInitialize(pScreen, screenFuncs)) {
-        free((pointer) pScreenPriv);
+        free((void *) pScreenPriv);
         return FALSE;
     }
     return TRUE;
@@ -152,7 +152,7 @@ miDCCloseScreen(ScreenPtr pScreen)
     pScreen->CloseScreen = pScreenPriv->CloseScreen;
 
     miDCSwitchScreenCursor(pScreen, NULL, NULL, NULL, NULL);
-    free((pointer) pScreenPriv);
+    free((void *) pScreenPriv);
     return (*pScreen->CloseScreen) (pScreen);
 }