StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xkbcomp/alias.c
View File

@ -29,7 +29,7 @@
#include "alias.h" #include "alias.h"
#include "keycodes.h" #include "keycodes.h"
#include <X11/extensions/XKBgeom.h> #include <X11/extensions/XKBgeomcommon.h>
static void static void
HandleCollision(AliasInfo * old, AliasInfo * new) HandleCollision(AliasInfo * old, AliasInfo * new)

2
src/xkbcomp/geometry.c
View File

@ -34,7 +34,7 @@
#include "keycodes.h" #include "keycodes.h"
#include "alias.h" #include "alias.h"
#include "X11/extensions/XKBgeom.h" #include <X11/extensions/XKBgeomcommon.h>
#define DFLT_FONT "helvetica" #define DFLT_FONT "helvetica"
#define DFLT_SLANT "r" #define DFLT_SLANT "r"

2
src/xkbcomp/listing.c
View File

@ -121,7 +121,7 @@ SOFTWARE.
#include "parseutils.h" #include "parseutils.h"
#include "misc.h" #include "misc.h"
#include "tokens.h" #include "tokens.h"
#include <X11/extensions/XKBgeom.h> #include <X11/extensions/XKBgeomcommon.h>
#define lowbit(x) ((x) & (-(x))) #define lowbit(x) ((x) & (-(x)))

2
src/xkbcomp/misc.c
View File

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

2
src/xkbcomp/parseutils.c
View File

@ -28,7 +28,7 @@
#include "parseutils.h" #include "parseutils.h"
#include "xkbpath.h" #include "xkbpath.h"
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/extensions/XKBgeom.h> #include <X11/extensions/XKBgeomcommon.h>
#include <X11/Xalloca.h> #include <X11/Xalloca.h>
XkbFile *rtrnValue; XkbFile *rtrnValue;

2
src/xkbcomp/vmod.c
View File

@ -32,7 +32,7 @@
#include "misc.h" #include "misc.h"
#include <X11/extensions/XKB.h> #include <X11/extensions/XKB.h>
#include <X11/extensions/XKBstr.h> #include <X11/extensions/XKBstrcommon.h>
#include "vmod.h" #include "vmod.h"

4
src/xkbcomp/xkbcomp.h
View File

@ -31,13 +31,9 @@
#define DEBUG_VAR debugFlags #define DEBUG_VAR debugFlags
#endif #endif
#include <X11/Xlib.h>
#include <X11/XKBlib.h>
#include "utils.h" #include "utils.h"
#include <X11/extensions/XKM.h> #include <X11/extensions/XKM.h>
#include <X11/extensions/XKBfile.h>
extern char *scanFile; extern char *scanFile;

2
src/xkbcomp/xkbparse.c
View File

@ -208,7 +208,7 @@
#define DEBUG_VAR parseDebug #define DEBUG_VAR parseDebug
#include "parseutils.h" #include "parseutils.h"
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/extensions/XKBgeom.h> #include <X11/extensions/XKBgeomcommon.h>
#include <stdlib.h> #include <stdlib.h>
unsigned int parseDebug; unsigned int parseDebug;

2
src/xkbcomp/xkbparse.y
View File

@ -95,7 +95,7 @@
#define DEBUG_VAR parseDebug #define DEBUG_VAR parseDebug
#include "parseutils.h" #include "parseutils.h"
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/extensions/XKBgeom.h> #include <X11/extensions/XKBgeomcommon.h>
#include <stdlib.h> #include <stdlib.h>
unsigned int parseDebug; unsigned int parseDebug;

3
src/xkbcomp/xkbpath.c
View File

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

2
src/xkbcomp/xkbscan.c
View File

@ -27,8 +27,6 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <X11/Xos.h> #include <X11/Xos.h>
#include <X11/Xlib.h>
#include <X11/XKBlib.h>
#include "tokens.h" #include "tokens.h"
#define DEBUG_VAR scanDebug #define DEBUG_VAR scanDebug