summaryrefslogtreecommitdiff
path: root/test/common.c
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-09-21 14:44:17 +0300
committerDaniel Stone <daniel@fooishbar.org>2012-09-24 09:08:53 +1000
commitfcd202909bd558074885c8a35400e180646e115b (patch)
tree8e1f203c01fa0854f3c859668bda52a4f792dc4f /test/common.c
parentbf19408078824f96d2c265ad15e4ff12505166cc (diff)
downloadxorg-lib-libxkbcommon-fcd202909bd558074885c8a35400e180646e115b.tar.gz
Don't use xkbcommon-compat names in internal code
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'test/common.c')
-rw-r--r--test/common.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/common.c b/test/common.c
index 372c642..f960501 100644
--- a/test/common.c
+++ b/test/common.c
@@ -117,8 +117,8 @@ test_compile_file(struct xkb_context *context, const char *path_rel)
}
assert(file != NULL);
- keymap = xkb_map_new_from_file(context, file,
- XKB_KEYMAP_FORMAT_TEXT_V1, 0);
+ keymap = xkb_keymap_new_from_file(context, file,
+ XKB_KEYMAP_FORMAT_TEXT_V1, 0);
fclose(file);
if (!keymap) {
@@ -136,8 +136,8 @@ test_compile_string(struct xkb_context *context, const char *string)
{
struct xkb_keymap *keymap;
- keymap = xkb_map_new_from_string(context, string,
- XKB_KEYMAP_FORMAT_TEXT_V1, 0);
+ keymap = xkb_keymap_new_from_string(context, string,
+ XKB_KEYMAP_FORMAT_TEXT_V1, 0);
if (!keymap) {
fprintf(stderr, "Failed to compile string\n");
return NULL;
@@ -160,7 +160,7 @@ test_compile_rules(struct xkb_context *context, const char *rules,
.options = options
};
- keymap = xkb_map_new_from_names(context, &rmlvo, 0);
+ keymap = xkb_keymap_new_from_names(context, &rmlvo, 0);
if (!keymap) {
fprintf(stderr,
"Failed to compile RMLVO: '%s', '%s', '%s', '%s', '%s'\n",