summaryrefslogtreecommitdiff
path: root/action.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-17 19:03:48 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-17 19:03:48 +0000
commitae4c01f83c60e931983c74d6285c6a22e3c33034 (patch)
tree8e4ea351343b9404a9724600e98d417794c14c4b /action.h
parent262961d88faf67f69f4630acb8234a4f2c5a6e80 (diff)
downloadxorg-app-xkbcomp-ae4c01f83c60e931983c74d6285c6a22e3c33034.tar.gz
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'action.h')
-rw-r--r--action.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/action.h b/action.h
index f588ff4..c442a41 100644
--- a/action.h
+++ b/action.h
@@ -24,6 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
+/* $XFree86: xc/programs/xkbcomp/action.h,v 3.3 2002/07/01 02:26:00 tsi Exp $ */
#ifndef ACTION_H
#define ACTION_H 1
@@ -65,30 +66,26 @@ typedef struct _ActionInfo {
} ActionInfo;
extern int HandleActionDef(
-#if NeedFunctionPrototypes
ExprDef * /* def */,
XkbDescPtr /* xkb */,
XkbAnyAction * /* action */,
unsigned /* mergeMode */,
ActionInfo * /* info */
-#endif
);
extern int SetActionField(
-#if NeedFunctionPrototypes
XkbDescPtr /* xkb */,
char * /* elem */,
char * /* field */,
ExprDef * /* index */,
ExprDef * /* value */,
ActionInfo ** /* info_rtrn */
-#endif
);
extern void ActionsInit(
-#if NeedFunctionPrototypes
void
-#endif
);
+extern LookupEntry ctrlNames[];
+
#endif /* ACTION_H */