Commit 30e01032161db141524a4ff8cb88ab21a987dd9e
2009-03-27T19:25:14
libxkbcomp: Remove usage of client-side headers This will surely break things. Let's see just what we need to replace.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
diff --git a/src/xkbcomp/alias.c b/src/xkbcomp/alias.c
index ba55d3d..aadf535 100644
--- a/src/xkbcomp/alias.c
+++ b/src/xkbcomp/alias.c
@@ -29,7 +29,7 @@
#include "alias.h"
#include "keycodes.h"
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
static void
HandleCollision(AliasInfo * old, AliasInfo * new)
diff --git a/src/xkbcomp/geometry.c b/src/xkbcomp/geometry.c
index 6eb3fb8..64d73fe 100644
--- a/src/xkbcomp/geometry.c
+++ b/src/xkbcomp/geometry.c
@@ -34,7 +34,7 @@
#include "keycodes.h"
#include "alias.h"
-#include "X11/extensions/XKBgeom.h"
+#include <X11/extensions/XKBgeomcommon.h>
#define DFLT_FONT "helvetica"
#define DFLT_SLANT "r"
diff --git a/src/xkbcomp/listing.c b/src/xkbcomp/listing.c
index 146ecba..6d3fb8f 100644
--- a/src/xkbcomp/listing.c
+++ b/src/xkbcomp/listing.c
@@ -121,7 +121,7 @@ SOFTWARE.
#include "parseutils.h"
#include "misc.h"
#include "tokens.h"
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
#define lowbit(x) ((x) & (-(x)))
diff --git a/src/xkbcomp/misc.c b/src/xkbcomp/misc.c
index 1607ff5..993c62f 100644
--- a/src/xkbcomp/misc.c
+++ b/src/xkbcomp/misc.c
@@ -32,7 +32,7 @@
#include <X11/keysym.h>
#include "parseutils.h"
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
/***====================================================================***/
diff --git a/src/xkbcomp/parseutils.c b/src/xkbcomp/parseutils.c
index ad1b0d1..5ab435e 100644
--- a/src/xkbcomp/parseutils.c
+++ b/src/xkbcomp/parseutils.c
@@ -28,7 +28,7 @@
#include "parseutils.h"
#include "xkbpath.h"
#include <X11/keysym.h>
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
#include <X11/Xalloca.h>
XkbFile *rtrnValue;
diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c
index 5578fd0..c912a84 100644
--- a/src/xkbcomp/vmod.c
+++ b/src/xkbcomp/vmod.c
@@ -32,7 +32,7 @@
#include "misc.h"
#include <X11/extensions/XKB.h>
-#include <X11/extensions/XKBstr.h>
+#include <X11/extensions/XKBstrcommon.h>
#include "vmod.h"
diff --git a/src/xkbcomp/xkbcomp.h b/src/xkbcomp/xkbcomp.h
index 6e02ed5..c6fce0b 100644
--- a/src/xkbcomp/xkbcomp.h
+++ b/src/xkbcomp/xkbcomp.h
@@ -31,13 +31,9 @@
#define DEBUG_VAR debugFlags
#endif
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-
#include "utils.h"
#include <X11/extensions/XKM.h>
-#include <X11/extensions/XKBfile.h>
extern char *scanFile;
diff --git a/src/xkbcomp/xkbparse.c b/src/xkbcomp/xkbparse.c
index b71df99..db4dfc5 100644
--- a/src/xkbcomp/xkbparse.c
+++ b/src/xkbcomp/xkbparse.c
@@ -208,7 +208,7 @@
#define DEBUG_VAR parseDebug
#include "parseutils.h"
#include <X11/keysym.h>
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
#include <stdlib.h>
unsigned int parseDebug;
diff --git a/src/xkbcomp/xkbparse.y b/src/xkbcomp/xkbparse.y
index 63f87bb..2360f24 100644
--- a/src/xkbcomp/xkbparse.y
+++ b/src/xkbcomp/xkbparse.y
@@ -95,7 +95,7 @@
#define DEBUG_VAR parseDebug
#include "parseutils.h"
#include <X11/keysym.h>
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
#include <stdlib.h>
unsigned int parseDebug;
diff --git a/src/xkbcomp/xkbpath.c b/src/xkbcomp/xkbpath.c
index 6802012..0566b08 100644
--- a/src/xkbcomp/xkbpath.c
+++ b/src/xkbcomp/xkbpath.c
@@ -24,9 +24,6 @@
********************************************************/
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-
#define DEBUG_VAR debugFlags
#include "utils.h"
#include <stdlib.h>
diff --git a/src/xkbcomp/xkbscan.c b/src/xkbcomp/xkbscan.c
index 31cafd4..997b5f5 100644
--- a/src/xkbcomp/xkbscan.c
+++ b/src/xkbcomp/xkbscan.c
@@ -27,8 +27,6 @@
#include <stdio.h>
#include <ctype.h>
#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
#include "tokens.h"
#define DEBUG_VAR scanDebug