summaryrefslogtreecommitdiff
path: root/xkbcomp.h
diff options
context:
space:
mode:
Diffstat (limited to 'xkbcomp.h')
-rw-r--r--xkbcomp.h48
1 files changed, 10 insertions, 38 deletions
diff --git a/xkbcomp.h b/xkbcomp.h
index 46fe4a4..0584846 100644
--- a/xkbcomp.h
+++ b/xkbcomp.h
@@ -24,6 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
+/* $XFree86: xc/programs/xkbcomp/xkbcomp.h,v 3.9 2002/06/05 00:00:38 dawes Exp $ */
#ifndef XKBCOMP_H
#define XKBCOMP_H 1
@@ -119,6 +120,7 @@ typedef struct _IncludeStmt {
char *stmt;
char *file;
char *map;
+ char *modifier;
char *path;
struct _IncludeStmt *next;
} IncludeStmt;
@@ -227,13 +229,6 @@ typedef struct _InterpDef {
VarDef *def;
} InterpDef;
-typedef struct _IndicatorMapDef {
- ParseCommon common;
- unsigned merge;
- Atom name;
- VarDef * body;
-} IndicatorMapDef;
-
typedef struct _IndicatorNameDef {
ParseCommon common;
unsigned merge;
@@ -300,6 +295,11 @@ typedef struct _DoodadDef {
VarDef * body;
} DoodadDef;
+/* IndicatorMapDef doesn't use the type field, but the rest of the fields
+ need to be at the same offsets as in DoodadDef. Use #define to avoid
+ any strict aliasing problems. */
+#define IndicatorMapDef DoodadDef
+
typedef struct _XkbFile {
ParseCommon common;
int type;
@@ -311,61 +311,45 @@ typedef struct _XkbFile {
Bool compiled;
} XkbFile;
-_XFUNCPROTOBEGIN
-
extern Bool CompileKeymap(
-#if NeedFunctionPrototypes
XkbFile * /* file */,
XkbFileInfo * /* result */,
unsigned /* merge */
-#endif
);
extern Bool CompileKeycodes(
-#if NeedFunctionPrototypes
XkbFile * /* file */,
XkbFileInfo * /* result */,
unsigned /* merge */
-#endif
);
extern Bool CompileGeometry(
-#if NeedFunctionPrototypes
XkbFile * /* file */,
XkbFileInfo * /* result */,
unsigned /* merge */
-#endif
);
extern Bool CompileKeyTypes(
-#if NeedFunctionPrototypes
XkbFile * /* file */,
XkbFileInfo * /* result */,
unsigned /* merge */
-#endif
);
typedef struct _LEDInfo *LEDInfoPtr;
extern Bool CompileCompatMap(
-#if NeedFunctionPrototypes
XkbFile * /* file */,
XkbFileInfo * /* result */,
unsigned /* merge */,
LEDInfoPtr * /* unboundLEDs */
-#endif
);
extern Bool CompileSymbols(
-#if NeedFunctionPrototypes
XkbFile * /* file */,
XkbFileInfo * /* result */,
unsigned /* merge */
-#endif
);
-_XFUNCPROTOEND
-
#define WantLongListing (1<<0)
#define WantPartialMaps (1<<1)
#define WantHiddenMaps (1<<2)
@@ -376,33 +360,21 @@ extern char * rootDir;
extern unsigned verboseLevel;
extern unsigned dirsToStrip;
-_XFUNCPROTOBEGIN
-
extern Bool AddListing(
-#if NeedFunctionPrototypes
char * /* file */,
- char * /* map */
-#endif
+ char * /* map */
);
extern Bool AddMatchingFiles(
-#if NeedFunctionPrototypes
- char * /* head_in */
-#endif
+ char * /* head_in */
);
-extern int AddMapOnly(
-#if NeedFunctionPrototypes
+extern int AddMapOnly(
char * /* map */
-#endif
);
extern int GenerateListing(
-#if NeedFunctionPrototypes
char * /* filename */
-#endif
);
-_XFUNCPROTOEND
-
#endif /* XKBCOMP_H */