summaryrefslogtreecommitdiff
path: root/include/xkbrules.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-11-16 23:43:49 -0800
committerKeith Packard <keithp@keithp.com>2014-01-12 10:14:48 -0800
commit1f407763be28745f18d224077d6b07b9431ee16b (patch)
treec7954156c66e0083c4d0e96e55664a5eb75c8dd5 /include/xkbrules.h
parente1e01d2e33c632e395d7e396f73fba8ae606b15a (diff)
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>
Diffstat (limited to 'include/xkbrules.h')
-rw-r--r--include/xkbrules.h40
1 files changed, 20 insertions, 20 deletions
diff --git a/include/xkbrules.h b/include/xkbrules.h
index d21731884..5b69d0db2 100644
--- a/include/xkbrules.h
+++ b/include/xkbrules.h
@@ -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)