include: Make xkbrules structures all const char *

This lets them be initialized with string constants

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2013-11-16 23:43:49 -08:00
parent e1e01d2e33
commit 1f407763be

View File

@ -30,41 +30,41 @@
/***====================================================================***/ /***====================================================================***/
typedef struct _XkbRMLVOSet { typedef struct _XkbRMLVOSet {
char *rules; const char *rules;
char *model; const char *model;
char *layout; const char *layout;
char *variant; const char *variant;
char *options; const char *options;
} XkbRMLVOSet; } XkbRMLVOSet;
typedef struct _XkbRF_VarDefs { typedef struct _XkbRF_VarDefs {
char *model; const char *model;
char *layout; const char *layout;
char *variant; const char *variant;
char *options; const char *options;
} XkbRF_VarDefsRec, *XkbRF_VarDefsPtr; } XkbRF_VarDefsRec, *XkbRF_VarDefsPtr;
typedef struct _XkbRF_Rule { typedef struct _XkbRF_Rule {
int number; int number;
int layout_num; int layout_num;
int variant_num; int variant_num;
char *model; const char *model;
char *layout; const char *layout;
char *variant; const char *variant;
char *option; const char *option;
/* yields */ /* yields */
char *keycodes; const char *keycodes;
char *symbols; const char *symbols;
char *types; const char *types;
char *compat; const char *compat;
char *geometry; const char *geometry;
unsigned flags; unsigned flags;
} XkbRF_RuleRec, *XkbRF_RulePtr; } XkbRF_RuleRec, *XkbRF_RulePtr;
typedef struct _XkbRF_Group { typedef struct _XkbRF_Group {
int number; int number;
char *name; const char *name;
char *words; const char *words;
} XkbRF_GroupRec, *XkbRF_GroupPtr; } XkbRF_GroupRec, *XkbRF_GroupPtr;
#define XkbRF_PendingMatch (1L<<1) #define XkbRF_PendingMatch (1L<<1)