aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/alias.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 18:58:20 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 18:58:20 +0000
commite2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (patch)
treed25ddcc9b5bb33bef4832bd6e8702061a9887a53 /xkbcomp/alias.h
parente445df175688f07d599649591c990d432375c67e (diff)
parentdc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff)
downloadvcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.tar.gz
vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.tar.bz2
vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xkbcomp/alias.h')
-rw-r--r--xkbcomp/alias.h51
1 files changed, 23 insertions, 28 deletions
diff --git a/xkbcomp/alias.h b/xkbcomp/alias.h
index fd0338847..b6fac5bfa 100644
--- a/xkbcomp/alias.h
+++ b/xkbcomp/alias.h
@@ -1,4 +1,3 @@
-/* $Xorg: alias.h,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -24,38 +23,34 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifndef ALIAS_H
#define ALIAS_H 1
-typedef struct _AliasInfo {
- CommonInfo def;
- char alias[XkbKeyNameLength+1];
- char real[XkbKeyNameLength+1];
+typedef struct _AliasInfo
+{
+ CommonInfo def;
+ char alias[XkbKeyNameLength + 1];
+ char real[XkbKeyNameLength + 1];
} AliasInfo;
-extern int HandleAliasDef(
- KeyAliasDef * /* def */,
- unsigned /* merge */,
- unsigned /* file_id */,
- AliasInfo ** /* info */
-);
-
-extern void ClearAliases(
- AliasInfo ** /* info */
-);
-
-extern Bool MergeAliases(
- AliasInfo ** /* into */,
- AliasInfo ** /* merge */,
- unsigned /* how_merge */
-);
-
-extern int ApplyAliases(
- XkbDescPtr /* xkb */,
- Bool /* toGeom */,
- AliasInfo ** /* info */
-);
+extern int HandleAliasDef(KeyAliasDef * /* def */ ,
+ unsigned /* merge */ ,
+ unsigned /* file_id */ ,
+ AliasInfo ** /* info */
+ );
+
+extern void ClearAliases(AliasInfo ** /* info */
+ );
+
+extern Bool MergeAliases(AliasInfo ** /* into */ ,
+ AliasInfo ** /* merge */ ,
+ unsigned /* how_merge */
+ );
+
+extern int ApplyAliases(XkbDescPtr /* xkb */ ,
+ Bool /* toGeom */ ,
+ AliasInfo ** /* info */
+ );
#endif /* ALIAS_H */