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/dix-config.h.in | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'xorg-server/include/dix-config.h.in')

diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in
index 306610000..957257b12 100644
--- a/xorg-server/include/dix-config.h.in
+++ b/xorg-server/include/dix-config.h.in
@@ -469,4 +469,7 @@
 /* Directory for shared memory temp files */
 #undef SHMDIR
 
+/* Don't let Xdefs.h define 'pointer' */
+#define _XTYPEDEF_POINTER       1
+
 #endif /* _DIX_CONFIG_H_ */
-- 
cgit v1.2.3