Shorten context to ctx

[platform/upstream/libxkbcommon.git] / src / xkbcomp / xkbcomp.h

diff --git a/src/xkbcomp/xkbcomp.h b/src/xkbcomp/xkbcomp.h
index 1883b9d..a4078a3 100644 (file)
--- a/src/xkbcomp/xkbcomp.h
+++ b/src/xkbcomp/xkbcomp.h
@@ -27,8 +27,7 @@
 #ifndef XKBCOMP_H
 #define        XKBCOMP_H 1
 
-#include "XKBcommonint.h"
-#include "xkbmisc.h"
+#include "xkb-priv.h"
 
 #define        TypeUnknown     0
 #define        TypeBoolean     1
@@ -251,21 +250,21 @@ typedef struct _XkbFile
 } XkbFile;
 
 extern struct xkb_keymap *
-CompileKeymap(struct xkb_context *context, XkbFile *file);
+CompileKeymap(struct xkb_ctx *ctx, XkbFile *file);
 
 extern bool
-CompileKeycodes(XkbFile *file, struct xkb_keymap * xkb, unsigned merge);
+CompileKeycodes(XkbFile *file, struct xkb_keymap *keymap, unsigned merge);
 
 extern bool
-CompileKeyTypes(XkbFile *file, struct xkb_keymap * xkb, unsigned merge);
+CompileKeyTypes(XkbFile *file, struct xkb_keymap *keymap, unsigned merge);
 
 typedef struct _LEDInfo *LEDInfoPtr;
 
 extern bool
-CompileCompatMap(XkbFile *file, struct xkb_keymap * xkb, unsigned merge,
+CompileCompatMap(XkbFile *file, struct xkb_keymap *keymap, unsigned merge,
                  LEDInfoPtr *unboundLEDs);
 
 extern bool
-CompileSymbols(XkbFile *file, struct xkb_keymap * xkb, unsigned merge);
+CompileSymbols(XkbFile *file, struct xkb_keymap *keymap, unsigned merge);
 
 #endif /* XKBCOMP_H */