StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename XkbRMLVOSet to struct xkb_rule_names

master
Kristian Høgsberg 2010-07-02 12:14:03 -04:00
parent 15f259993e
commit 97fbc348b0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/X11/extensions/XKBcommon.h
View File

@ -68,13 +68,13 @@ typedef unsigned char KeyCode;
typedef int Bool; typedef int Bool;
#endif #endif
typedef struct _XkbRMLVOSet { struct xkb_rule_names {
char * rules; char * rules;
char * model; char * model;
char * layout; char * layout;
char * variant; char * variant;
char * options; char * options;
} XkbRMLVOSet; };
#define XkbcAnyActionDataSize 18 #define XkbcAnyActionDataSize 18
struct xkb_any_action { struct xkb_any_action {
@ -760,7 +760,7 @@ _X_EXPORT extern void
xkb_init_atoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value); xkb_init_atoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value);
_X_EXPORT extern struct xkb_desc * _X_EXPORT extern struct xkb_desc *
xkb_compile_keymap_from_rules(const XkbRMLVOSet *rmlvo); xkb_compile_keymap_from_rules(const struct xkb_rule_names *rules);
_X_EXPORT extern struct xkb_desc * _X_EXPORT extern struct xkb_desc *
xkb_compile_keymap_from_components(const struct xkb_component_names * ktcsg); xkb_compile_keymap_from_components(const struct xkb_component_names * ktcsg);

2
src/xkbcomp/xkbcomp.c
View File

@ -136,7 +136,7 @@ out:
} }
struct xkb_desc * struct xkb_desc *
xkb_compile_keymap_from_rules(const XkbRMLVOSet *rmlvo) xkb_compile_keymap_from_rules(const struct xkb_rule_names *rmlvo)
{ {
XkbRF_VarDefsRec defs; XkbRF_VarDefsRec defs;
struct xkb_component_names * names; struct xkb_component_names * names;

2
test/rulescomp.c
View File

@ -33,7 +33,7 @@ authorization from the authors.
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
XkbRMLVOSet rmlvo; struct xkb_rule_names rmlvo;
struct xkb_desc * xkb; struct xkb_desc * xkb;
/* Require rmlvo */ /* Require rmlvo */