diff options
| author | Ran Benita <ran234@gmail.com> | 2013-11-30 23:24:18 +0200 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2013-12-01 10:47:56 +0200 |
| commit | c24b6420252a92823ac1503d168d81f648830e42 (patch) | |
| tree | 45c3d240982c7dc882fba1acb516405912517daa /src/xkbcomp/expr.c | |
| parent | c5d859385f1e65ce84e90beff384d92d1362646a (diff) | |
| download | xorg-lib-libxkbcommon-c24b6420252a92823ac1503d168d81f648830e42.tar.gz | |
expr: add constructor for boolean expressions
Also add a 'bool set' to the ExprDef union, instead of using 'ival' as a
bool.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/xkbcomp/expr.c')
| -rw-r--r-- | src/xkbcomp/expr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c index 4d61609..227f351 100644 --- a/src/xkbcomp/expr.c +++ b/src/xkbcomp/expr.c @@ -135,7 +135,7 @@ ExprResolveBoolean(struct xkb_context *ctx, const ExprDef *expr, expr_value_type_to_string(expr->value_type)); return false; } - *set_rtrn = !!expr->value.ival; + *set_rtrn = expr->value.set; return true; case EXPR_IDENT: @@ -205,7 +205,7 @@ ExprResolveKeyCode(struct xkb_context *ctx, const ExprDef *expr, return false; } - *kc = expr->value.uval; + *kc = (xkb_keycode_t) expr->value.ival; return true; case EXPR_ADD: |