From 97fbc348b00bd30faa934a8ae8145cbaac9db881 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 2 Jul 2010 12:14:03 -0400 Subject: [PATCH] Rename XkbRMLVOSet to struct xkb_rule_names --- include/X11/extensions/XKBcommon.h | 6 +++--- src/xkbcomp/xkbcomp.c | 2 +- test/rulescomp.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/X11/extensions/XKBcommon.h b/include/X11/extensions/XKBcommon.h index 15c99ae..f622fb8 100644 --- a/include/X11/extensions/XKBcommon.h +++ b/include/X11/extensions/XKBcommon.h @@ -68,13 +68,13 @@ typedef unsigned char KeyCode; typedef int Bool; #endif -typedef struct _XkbRMLVOSet { +struct xkb_rule_names { char * rules; char * model; char * layout; char * variant; char * options; -} XkbRMLVOSet; +}; #define XkbcAnyActionDataSize 18 struct xkb_any_action { @@ -760,7 +760,7 @@ _X_EXPORT extern void xkb_init_atoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value); _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 * xkb_compile_keymap_from_components(const struct xkb_component_names * ktcsg); diff --git a/src/xkbcomp/xkbcomp.c b/src/xkbcomp/xkbcomp.c index b68e2b7..679b00b 100644 --- a/src/xkbcomp/xkbcomp.c +++ b/src/xkbcomp/xkbcomp.c @@ -136,7 +136,7 @@ out: } 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; struct xkb_component_names * names; diff --git a/test/rulescomp.c b/test/rulescomp.c index 2395daf..39e1a2d 100644 --- a/test/rulescomp.c +++ b/test/rulescomp.c @@ -33,7 +33,7 @@ authorization from the authors. int main(int argc, char *argv[]) { - XkbRMLVOSet rmlvo; + struct xkb_rule_names rmlvo; struct xkb_desc * xkb; /* Require rmlvo */ -- 2.7.4