mesa xkeyboard-config xserver git update 15 jan 2014

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

1 files changed, 19 insertions, 19 deletions

diff --git a/xorg-server/include/xkbrules.h b/xorg-server/include/xkbrules.h
index d21731884..956eade0b 100644
--- a/xorg-server/include/xkbrules.h
+++ b/xorg-server/include/xkbrules.h
@@ -30,40 +30,40 @@
 /***====================================================================***/
 
 typedef struct _XkbRMLVOSet {
-    char *rules;
-    char *model;
-    char *layout;
-    char *variant;
-    char *options;
+    const char *rules;
+    const char *model;
+    const char *layout;
+    const char *variant;
+    const char *options;
 } XkbRMLVOSet;
 
 typedef struct _XkbRF_VarDefs {
-    char *model;
-    char *layout;
-    char *variant;
-    char *options;
+    const char *model;
+    const char *layout;
+    const char *variant;
+    const char *options;
 } XkbRF_VarDefsRec, *XkbRF_VarDefsPtr;
 
 typedef struct _XkbRF_Rule {
     int number;
     int layout_num;
     int variant_num;
-    char *model;
-    char *layout;
-    char *variant;
-    char *option;
+    const char *model;
+    const char *layout;
+    const char *variant;
+    const char *option;
     /* yields */
-    char *keycodes;
-    char *symbols;
-    char *types;
-    char *compat;
-    char *geometry;
+    const char *keycodes;
+    const char *symbols;
+    const char *types;
+    const char *compat;
+    const char *geometry;
     unsigned flags;
 } XkbRF_RuleRec, *XkbRF_RulePtr;
 
 typedef struct _XkbRF_Group {
     int number;
-    char *name;
+    const char *name;
     char *words;
 } XkbRF_GroupRec, *XkbRF_GroupPtr;