diff options
| author | Ran Benita <ran234@gmail.com> | 2014-02-08 16:40:20 +0200 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2014-02-08 16:40:20 +0200 |
| commit | 973b8fd47e885f1c80c715b317fa896f8d31a7a4 (patch) | |
| tree | a9a18dd9c3ccc9e2498e2e81e603d06a8064b3fa /src/x11/keymap.c | |
| parent | 8cc9434fd2578bc22ce6296b465bbe652b7ecdf1 (diff) | |
| download | xorg-lib-libxkbcommon-973b8fd47e885f1c80c715b317fa896f8d31a7a4.tar.gz | |
api: deprecate XKB_MAP_COMPILE_PLACEHOLDER, and use KEYMAP instead of MAP
The PLACEHOLDER was not meant to be used, but c++ doesn't like passing 0
to enums, so it was used. For this reason we add all the NO_FLAGS items,
so the PLACEHOLDER shouldn't be used anymore.
Second, XKB_MAP is the prefix we used ages ago, KEYMAP is the expected
prefix here. So deprecate that as well.
The old names may still be used through the xkbcommon-compat.h header,
which is included by default (no need to include directly).
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/x11/keymap.c')
| -rw-r--r-- | src/x11/keymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/x11/keymap.c b/src/x11/keymap.c index fd05fab..aa91033 100644 --- a/src/x11/keymap.c +++ b/src/x11/keymap.c @@ -1125,7 +1125,7 @@ xkb_x11_keymap_new_from_device(struct xkb_context *ctx, struct xkb_keymap *keymap; const enum xkb_keymap_format format = XKB_KEYMAP_FORMAT_TEXT_V1; - if (flags & ~(XKB_MAP_COMPILE_PLACEHOLDER)) { + if (flags & ~(XKB_KEYMAP_COMPILE_NO_FLAGS)) { log_err_func(ctx, "unrecognized flags: %#x\n", flags); return NULL; } |