libxkbcomp: Remove usage of client-side headers

This will surely break things. Let's see just what we need to replace.
master
Dan Nicholson 2009-03-27 19:25:14 -07:00
parent a3809b1340
commit 30e0103216
11 changed files with 8 additions and 17 deletions

View File

@ -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)

View File

@ -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"

View File

@ -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)))

View File

@ -32,7 +32,7 @@
#include <X11/keysym.h>
#include "parseutils.h"
#include <X11/extensions/XKBgeom.h>
#include <X11/extensions/XKBgeomcommon.h>
/***====================================================================***/

View File

@ -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;

View File

@ -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"

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -24,9 +24,6 @@
********************************************************/
#include <X11/Xlib.h>
#include <X11/XKBlib.h>
#define DEBUG_VAR debugFlags
#include "utils.h"
#include <stdlib.h>

View File

@ -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