projects
/
platform
/
upstream
/
libxkbcommon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use CARD32 instead of Atom, move geom headers in
[platform/upstream/libxkbcommon.git]
/
src
/
xkbcomp
/
parseutils.h
diff --git
a/src/xkbcomp/parseutils.h
b/src/xkbcomp/parseutils.h
index
d96a20b
..
623347a
100644
(file)
--- a/
src/xkbcomp/parseutils.h
+++ b/
src/xkbcomp/parseutils.h
@@
-76,7
+76,7
@@
extern KeyAliasDef *KeyAliasCreate(char * /* alias */ ,
char * /* real */
);
char * /* real */
);
-extern VModDef *VModCreate(
Atom
/* name */ ,
+extern VModDef *VModCreate(
CARD32
/* name */ ,
ExprDef * /* value */
);
ExprDef * /* value */
);
@@
-84,7
+84,7
@@
extern VarDef *VarCreate(ExprDef * /* name */ ,
ExprDef * /* value */
);
ExprDef * /* value */
);
-extern VarDef *BoolVarCreate(
Atom
/* nameToken */ ,
+extern VarDef *BoolVarCreate(
CARD32
/* nameToken */ ,
unsigned /* set */
);
unsigned /* set */
);
@@
-92,7
+92,7
@@
extern InterpDef *InterpCreate(char * /* sym */ ,
ExprDef * /* match */
);
ExprDef * /* match */
);
-extern KeyTypeDef *KeyTypeCreate(
Atom
/* name */ ,
+extern KeyTypeDef *KeyTypeCreate(
CARD32
/* name */ ,
VarDef * /* body */
);
VarDef * /* body */
);
@@
-104,11
+104,11
@@
extern GroupCompatDef *GroupCompatCreate(int /* group */ ,
ExprDef * /* def */
);
ExprDef * /* def */
);
-extern ModMapDef *ModMapCreate(
Atom
/* modifier */ ,
+extern ModMapDef *ModMapCreate(
CARD32
/* modifier */ ,
ExprDef * /* keys */
);
ExprDef * /* keys */
);
-extern IndicatorMapDef *IndicatorMapCreate(
Atom
/* name */ ,
+extern IndicatorMapDef *IndicatorMapCreate(
CARD32
/* name */ ,
VarDef * /* body */
);
VarDef * /* body */
);
@@
-117,18
+117,18
@@
extern IndicatorNameDef *IndicatorNameCreate(int /* ndx */ ,
Bool /* virtual */
);
Bool /* virtual */
);
-extern ExprDef *ActionCreate(
Atom
/* name */ ,
+extern ExprDef *ActionCreate(
CARD32
/* name */ ,
ExprDef * /* args */
);
extern ExprDef *CreateKeysymList(char * /* sym */
);
ExprDef * /* args */
);
extern ExprDef *CreateKeysymList(char * /* sym */
);
-extern ShapeDef *ShapeDeclCreate(
Atom
/* name */ ,
+extern ShapeDef *ShapeDeclCreate(
CARD32
/* name */ ,
OutlineDef * /* outlines */
);
OutlineDef * /* outlines */
);
-extern OutlineDef *OutlineCreate(
Atom
/* field */ ,
+extern OutlineDef *OutlineCreate(
CARD32
/* field */ ,
ExprDef * /* points */
);
ExprDef * /* points */
);
@@
-143,7
+143,7
@@
extern KeyDef *KeyDeclMerge(KeyDef * /* into */ ,
extern RowDef *RowDeclCreate(KeyDef * /* keys */
);
extern RowDef *RowDeclCreate(KeyDef * /* keys */
);
-extern SectionDef *SectionDeclCreate(
Atom
/* name */ ,
+extern SectionDef *SectionDeclCreate(
CARD32
/* name */ ,
RowDef * /* rows */
);
RowDef * /* rows */
);
@@
-151,12
+151,12
@@
extern OverlayKeyDef *OverlayKeyCreate(char * /* under */ ,
char * /* over */
);
char * /* over */
);
-extern OverlayDef *OverlayDeclCreate(
Atom
/* name */ ,
+extern OverlayDef *OverlayDeclCreate(
CARD32
/* name */ ,
OverlayKeyDef * /* rows */
);
extern DoodadDef *DoodadCreate(unsigned /* type */ ,
OverlayKeyDef * /* rows */
);
extern DoodadDef *DoodadCreate(unsigned /* type */ ,
-
Atom
/* name */ ,
+
CARD32
/* name */ ,
VarDef * /* body */
);
VarDef * /* body */
);