diff options
author | Ran Benita <ran234@gmail.com> | 2012-08-13 11:00:43 +0300 |
---|---|---|
committer | Ran Benita <ran234@gmail.com> | 2012-09-01 10:58:10 +0300 |
commit | cdc228eaf6e55e0dfc524fe62cd1021f2467e3bf (patch) | |
tree | 98ced0725cb0d98157f14690680d8565ff897faf /src/xkbcomp/expr.h | |
parent | 3634b1565e00f72fcbde655363b85f8f060d91b5 (diff) |
Organize xkbcomp/ header files
Various non-functional changes:
- Re-add keycodes.h and move some stuff there.
- Add parser-priv.h for internal bison/flex stuff.
- Don't include headers from other headers, such that file dependencies
are immediate in each file.
- Rename xkbcomp.h -> ast.h, parseutils.{c,h} -> ast-build.{c,h}
- Rename path.{c,h} -> include.{c,h}
- Rename keytypes.c -> types.c
- Make the naming of XkbFile-related functions more consistent.
- Move xkb_map_{new,ref,unref} to map.c.
- Remove most extern keyword from function declarations, it's just
noise (XKB_EXPORT is what's important here).
- Append XKBCOMP_ to include guards.
- Shuffle some code around to make all of this work.
Splitting this would be a headache..
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/xkbcomp/expr.h')
-rw-r--r-- | src/xkbcomp/expr.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h index 7a2bf78..2771614 100644 --- a/src/xkbcomp/expr.h +++ b/src/xkbcomp/expr.h @@ -24,17 +24,15 @@ * ********************************************************/ -#ifndef EXPR_H -#define EXPR_H 1 - -#include "xkbcomp-priv.h" +#ifndef XKBCOMP_EXPR_H +#define XKBCOMP_EXPR_H typedef struct _LookupEntry { const char *name; unsigned int value; } LookupEntry; -extern const char * +const char * exprOpText(enum expr_op_type op); bool @@ -106,4 +104,4 @@ bool ExprResolveKeySym(struct xkb_context *ctx, const ExprDef *expr, xkb_keysym_t *sym_rtrn); -#endif /* EXPR_H */ +#endif |