summaryrefslogtreecommitdiff
path: root/src/xkbcomp/xkbcomp-priv.h
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-07-17 00:43:59 +0300
committerRan Benita <ran234@gmail.com>2012-07-18 14:07:02 +0300
commite21fc886ca1e57e7cba135f44778a986526503b8 (patch)
tree48ca09a73ffef202ff3d2fc10f20754f2ec75762 /src/xkbcomp/xkbcomp-priv.h
parentba4320f7b31a94ef13963977d96ca9c5f2b43c00 (diff)
downloadxorg-lib-libxkbcommon-e21fc886ca1e57e7cba135f44778a986526503b8.tar.gz
compat: use list instead of CommonInfo in SymInterpInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/xkbcomp/xkbcomp-priv.h')
-rw-r--r--src/xkbcomp/xkbcomp-priv.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xkbcomp/xkbcomp-priv.h b/src/xkbcomp/xkbcomp-priv.h
index 3b03709..7e5d47d 100644
--- a/src/xkbcomp/xkbcomp-priv.h
+++ b/src/xkbcomp/xkbcomp-priv.h
@@ -43,6 +43,11 @@ extern bool
UseNewField(unsigned field, CommonInfo *oldDefs, CommonInfo *newDefs,
unsigned *pCollide);
+bool
+use_new_field(unsigned field, short old_defined, unsigned old_file_id,
+ short new_defined, unsigned new_file_id,
+ enum merge_mode new_merge, unsigned *collide);
+
extern void *
ClearCommonInfo(CommonInfo *cmn);