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

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

diff --git a/xorg-server/include/closestr.h b/xorg-server/include/closestr.h
index c6aa1295f..60e6f09bc 100644
--- a/xorg-server/include/closestr.h
+++ b/xorg-server/include/closestr.h
@@ -47,7 +47,7 @@ typedef struct _OFclosure {
     Mask flags;
 
 /* XXX -- get these from request buffer instead? */
-    char *origFontName;
+    const char *origFontName;
     int origFontNameLen;
     XID fontid;
     char *fontname;
@@ -64,7 +64,7 @@ typedef struct _LFWIstate {
     int current_fpe;
     int max_names;
     Bool list_started;
-    pointer private;
+    void *private;
 } LFWIstateRec, *LFWIstatePtr;
 
 typedef struct _LFWIclosure {
-- 
cgit v1.2.3