summaryrefslogtreecommitdiff
path: root/app/xkbcomp/misc.h
diff options
context:
space:
mode:
Diffstat (limited to 'app/xkbcomp/misc.h')
-rw-r--r--app/xkbcomp/misc.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/app/xkbcomp/misc.h b/app/xkbcomp/misc.h
index e1ed7587c..b6a5288d3 100644
--- a/app/xkbcomp/misc.h
+++ b/app/xkbcomp/misc.h
@@ -36,11 +36,17 @@ typedef struct _CommonInfo
} CommonInfo;
extern Bool UseNewField(unsigned /* field */ ,
- const CommonInfo * /* oldDefs */ ,
- const CommonInfo * /* newDefs */ ,
+ CommonInfo * /* oldDefs */ ,
+ CommonInfo * /* newDefs */ ,
unsigned * /* pCollide */
);
+extern Bool MergeNewField(unsigned /* field */ ,
+ CommonInfo * /* oldDefs */ ,
+ CommonInfo * /* newDefs */ ,
+ unsigned * /* pCollide */
+ );
+
extern XPointer ClearCommonInfo(CommonInfo * /* cmn */
);