aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/action.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/action.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/action.h')
-rw-r--r--xkbcomp/action.h47
1 files changed, 21 insertions, 26 deletions
diff --git a/xkbcomp/action.h b/xkbcomp/action.h
index 4a1166420..2fb7a5eb9 100644
--- a/xkbcomp/action.h
+++ b/xkbcomp/action.h
@@ -1,4 +1,3 @@
-/* $Xorg: action.h,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifndef ACTION_H
#define ACTION_H 1
@@ -57,34 +55,31 @@
#define PrivateAction (XkbSA_LastAction+1)
-typedef struct _ActionInfo {
- unsigned action;
- unsigned field;
- ExprDef * array_ndx;
- ExprDef * value;
- struct _ActionInfo * next;
+typedef struct _ActionInfo
+{
+ unsigned action;
+ unsigned field;
+ ExprDef *array_ndx;
+ ExprDef *value;
+ struct _ActionInfo *next;
} ActionInfo;
-extern int HandleActionDef(
- ExprDef * /* def */,
- XkbDescPtr /* xkb */,
- XkbAnyAction * /* action */,
- unsigned /* mergeMode */,
- ActionInfo * /* info */
-);
+extern int HandleActionDef(ExprDef * /* def */ ,
+ XkbDescPtr /* xkb */ ,
+ XkbAnyAction * /* action */ ,
+ unsigned /* mergeMode */ ,
+ ActionInfo * /* info */
+ );
-extern int SetActionField(
- XkbDescPtr /* xkb */,
- char * /* elem */,
- char * /* field */,
- ExprDef * /* index */,
- ExprDef * /* value */,
- ActionInfo ** /* info_rtrn */
-);
+extern int SetActionField(XkbDescPtr /* xkb */ ,
+ char * /* elem */ ,
+ char * /* field */ ,
+ ExprDef * /* index */ ,
+ ExprDef * /* value */ ,
+ ActionInfo ** /* info_rtrn */
+ );
-extern void ActionsInit(
- void
-);
+extern void ActionsInit(void);
extern LookupEntry ctrlNames[];