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:
parent
e1e01d2e33
commit
1f407763be
|
@ -30,41 +30,41 @@
|
|||
/***====================================================================***/
|
||||
|
||||
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;
|
||||
char *words;
|
||||
const char *name;
|
||||
const char *words;
|
||||
} XkbRF_GroupRec, *XkbRF_GroupPtr;
|
||||
|
||||
#define XkbRF_PendingMatch (1L<<1)
|
||||
|
|
Loading…
Reference in New Issue
Block a user