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/include/miscstruct.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xorg-server/include/miscstruct.h')

diff --git a/xorg-server/include/miscstruct.h b/xorg-server/include/miscstruct.h
index 0820e1e81..dbab10f08 100644
--- a/xorg-server/include/miscstruct.h
+++ b/xorg-server/include/miscstruct.h
@@ -56,10 +56,10 @@ typedef xPoint DDXPointRec;
 typedef struct pixman_box16 BoxRec;
 
 typedef union _DevUnion {
-    pointer ptr;
+    void *ptr;
     long val;
     unsigned long uval;
-    pointer (*fptr) (void);
+    void *(*fptr) (void);
 } DevUnion;
 
 #endif                          /* MISCSTRUCT_H */
-- 
cgit v1.2.3