From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 15 Jan 2014 21:23:25 +0100
Subject: mesa xkeyboard-config xserver git update 15 jan 2014

xserver          commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa             commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
---
 xorg-server/fb/fbpixmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xorg-server/fb/fbpixmap.c')

diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c
index 0824b64bb..677f28af0 100644
--- a/xorg-server/fb/fbpixmap.c
+++ b/xorg-server/fb/fbpixmap.c
@@ -66,7 +66,7 @@ fbCreatePixmapBpp(ScreenPtr pScreen, int width, int height, int depth, int bpp,
     pPixmap->drawable.height = height;
     pPixmap->devKind = paddedWidth;
     pPixmap->refcnt = 1;
-    pPixmap->devPrivate.ptr = (pointer) ((char *) pPixmap + base + adjust);
+    pPixmap->devPrivate.ptr = (void *) ((char *) pPixmap + base + adjust);
     pPixmap->master_pixmap = NULL;
 
 #ifdef FB_DEBUG
-- 
cgit v1.2.3