debrix/xkb ddxBeep.c, 1.2, 1.3 ddxConfig.c, 1.2, 1.3 ddxCtrls.c, 1.2, 1.3 ddxDevBtn.c, 1.2, 1.3 ddxFakeBtn.c, 1.2, 1.3 ddxFakeMtn.c, 1.2, 1.3 ddxInit.c, 1.2, 1.3 ddxKeyClick.c, 1.2, 1.3 ddxKillSrv.c, 1.2, 1.3 ddxLEDs.c, 1.2, 1.3 ddxList.c, 1.2, 1.3 ddxLoad.c, 1.2, 1.3 ddxPrivate.c, 1.2, 1.3 ddxVT.c, 1.2, 1.3 xkb.c, 1.2, 1.3 xkbAccessX.c, 1.2, 1.3 xkbActions.c, 1.2, 1.3 xkbDflts.h, 1.2, 1.3 xkbEvents.c, 1.2, 1.3 xkbInit.c, 1.2, 1.3 xkbLEDs.c, 1.2, 1.3 xkbPrKeyEv.c, 1.2, 1.3 xkbPrOtherEv.c, 1.2, 1.3 xkbSwap.c, 1.2, 1.3 xkbUtils.c, 1.2, 1.3
Daniel Stone <xserver-commit-u7BhqnqprCWvj1b/[email protected]>
| Newsgroups | gmane.comp.freedesktop.xserver.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: daniel
Update of /cvs/xserver/debrix/xkb
In directory pdx:/home/daniel/x/debrix/debrix/xkb
Modified Files:
ddxBeep.c ddxConfig.c ddxCtrls.c ddxDevBtn.c ddxFakeBtn.c
ddxFakeMtn.c ddxInit.c ddxKeyClick.c ddxKillSrv.c ddxLEDs.c
ddxList.c ddxLoad.c ddxPrivate.c ddxVT.c xkb.c xkbAccessX.c
xkbActions.c xkbDflts.h xkbEvents.c xkbInit.c xkbLEDs.c
xkbPrKeyEv.c xkbPrOtherEv.c xkbSwap.c xkbUtils.c
Log Message:
Initial import from modular sources.
Index: ddxBeep.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxBeep.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxBeep.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxBeep.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.9 2002/12/05 21:59:00 paulo Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
@@ -34,8 +37,8 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
#if (defined(__osf__) && defined(__alpha))
#include <sys/sysinfo.h>
Index: ddxConfig.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxConfig.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxConfig.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxConfig.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/ddxConfig.c,v 3.8 2002/12/20 20:18:35 paulo Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
@@ -36,7 +39,7 @@
#include "windowstr.h"
#include "os.h"
#define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
#include <X11/extensions/XKBconfig.h>
Bool
Index: ddxCtrls.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxCtrls.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxCtrls.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxCtrls.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.3 2001/01/17 22:37:14 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
@@ -34,8 +37,8 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
void
XkbDDXKeybdCtrlProc(DeviceIntPtr dev,KeybdCtrl *ctrl)
Index: ddxDevBtn.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxDevBtn.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxDevBtn.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxDevBtn.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.3 2001/08/23 21:49:51 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
@@ -34,9 +37,9 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
extern int DeviceValuator;
Index: ddxFakeBtn.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxFakeBtn.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxFakeBtn.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxFakeBtn.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
@@ -34,8 +37,8 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
void
XkbDDXFakePointerButton(int event,int button)
Index: ddxFakeMtn.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxFakeMtn.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxFakeMtn.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxFakeMtn.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -27,6 +27,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.5 2003/09/13 16:39:01 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
@@ -35,8 +38,8 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
#ifdef PANORAMIX
#include "panoramiX.h"
Index: ddxInit.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxInit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxInit.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxInit.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
@@ -34,8 +37,8 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
int
XkbDDXInitDevice(DeviceIntPtr dev)
Index: ddxKeyClick.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxKeyClick.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxKeyClick.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxKeyClick.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
@@ -34,8 +37,8 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
void
XkbDDXKeyClick(DeviceIntPtr pXDev,int keycode,int synthetic)
Index: ddxKillSrv.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxKillSrv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxKillSrv.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxKillSrv.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
@@ -34,8 +37,8 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
#ifdef XF86DDXACTIONS
#include "xf86.h"
Index: ddxLEDs.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxLEDs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxLEDs.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxLEDs.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
@@ -34,8 +37,8 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
void
XkbDDXUpdateIndicators(DeviceIntPtr dev,CARD32 new)
Index: ddxList.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxList.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxList.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxList.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.8 2003/07/16 01:39:05 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <ctype.h>
#define NEED_EVENTS 1
@@ -38,8 +41,8 @@
#include "scrnintstr.h"
#include "windowstr.h"
#define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
#ifndef PATH_MAX
#ifdef MAXPATHLEN
Index: ddxLoad.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxLoad.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxLoad.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxLoad.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.35 2003/10/02 13:30:12 eich Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <ctype.h>
#define NEED_EVENTS 1
@@ -38,8 +41,8 @@
#include "scrnintstr.h"
#include "windowstr.h"
#define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
#include "xkb.h"
#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__)
Index: ddxPrivate.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxPrivate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxPrivate.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxPrivate.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -1,11 +1,14 @@
/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.2 2003/04/03 16:20:22 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
#include "windowstr.h"
#define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
#ifdef XF86DDXACTIONS
#include "xf86.h"
Index: ddxVT.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxVT.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ddxVT.c 23 Apr 2004 19:54:30 -0000 1.2
+++ ddxVT.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
@@ -34,8 +37,8 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
#ifdef XF86DDXACTIONS
#include "xf86.h"
Index: xkb.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xkb.c 23 Apr 2004 19:54:30 -0000 1.2
+++ xkb.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,20 +26,24 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.22tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
#define NEED_EVENTS
#define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
#define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
#include "extnsionst.h"
#include "modinit.h"
#include "xkb.h"
-#include "XI.h"
+#include <X11/extensions/XI.h>
int XkbEventBase;
int XkbErrorBase;
@@ -3907,8 +3911,6 @@
/***====================================================================***/
-#include "XKBgeom.h"
-
#define XkbSizeCountedString(s) ((s)?((((2+strlen(s))+3)/4)*4):4)
static char *
Index: xkbAccessX.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbAccessX.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xkbAccessX.c 23 Apr 2004 19:54:30 -0000 1.2
+++ xkbAccessX.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.9 2001/08/23 14:33:25 alanh Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <math.h>
#ifdef __QNX__
@@ -36,7 +39,7 @@
#include <X11/Xproto.h>
#include <X11/keysym.h>
#include "inputstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
#if !defined(WIN32) && !defined(Lynx)
#include <sys/time.h>
#endif
Index: xkbActions.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbActions.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xkbActions.c 23 Apr 2004 19:54:30 -0000 1.2
+++ xkbActions.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.13 2003/07/16 01:39:08 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <math.h>
#define NEED_EVENTS 1
@@ -34,7 +37,7 @@
#include <X11/keysym.h>
#include "misc.h"
#include "inputstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
#include "xkb.h"
#include <ctype.h>
Index: xkbDflts.h
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbDflts.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xkbDflts.h 23 Apr 2004 19:54:30 -0000 1.2
+++ xkbDflts.h 10 Jun 2004 19:42:11 -0000 1.3
@@ -2,6 +2,9 @@
/* $XFree86: xc/programs/Xserver/xkb/xkbDflts.h,v 1.2 2001/10/28 03:34:20 tsi Exp $ */
/* This file generated automatically by xkbcomp */
/* DO NOT EDIT */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef DEFAULT_H
#define DEFAULT_H 1
Index: xkbEvents.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbEvents.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xkbEvents.c 23 Apr 2004 19:54:30 -0000 1.2
+++ xkbEvents.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,15 +26,18 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.11 2003/07/16 01:39:10 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
-#include "XI.h"
+#include <X11/extensions/XI.h>
#include "inputstr.h"
#include "windowstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
#include "xkb.h"
/***====================================================================***/
Index: xkbInit.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbInit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xkbInit.c 23 Apr 2004 19:54:30 -0000 1.2
+++ xkbInit.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -27,6 +27,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.32tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -42,8 +45,8 @@
#include "opaque.h"
#include "property.h"
#define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
-#include "XKBgeom.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
#include <X11/extensions/XKMformat.h>
#include <X11/extensions/XKBfile.h>
#include "xkb.h"
Index: xkbLEDs.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbLEDs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xkbLEDs.c 23 Apr 2004 19:54:30 -0000 1.2
+++ xkbLEDs.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.7 2003/07/16 01:39:10 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <ctype.h>
#include <math.h>
@@ -35,8 +38,8 @@
#include "misc.h"
#include "inputstr.h"
-#include "XI.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XKBsrv.h>
#include "xkb.h"
/***====================================================================***/
Index: xkbPrKeyEv.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbPrKeyEv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xkbPrKeyEv.c 23 Apr 2004 19:54:30 -0000 1.2
+++ xkbPrKeyEv.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.8 2001/01/17 22:37:15 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <math.h>
#define NEED_EVENTS 1
@@ -34,7 +37,7 @@
#include <X11/keysym.h>
#include "misc.h"
#include "inputstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
#include <ctype.h>
Index: xkbPrOtherEv.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbPrOtherEv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xkbPrOtherEv.c 23 Apr 2004 19:54:30 -0000 1.2
+++ xkbPrOtherEv.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <math.h>
#define NEED_EVENTS 1
@@ -34,10 +37,10 @@
#include <X11/keysym.h>
#include "misc.h"
#include "inputstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
extern void ProcessOtherEvent(
xEvent * /* xE */,
Index: xkbSwap.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbSwap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xkbSwap.c 23 Apr 2004 19:54:30 -0000 1.2
+++ xkbSwap.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,15 +26,18 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.4 2003/09/13 16:39:01 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stdio.h"
-#include "X.h"
+#include <X11/X.h>
#define NEED_EVENTS
#define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
-#include "XKBsrv.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBstr.h>
#include "extnsionst.h"
#include "xkb.h"
Index: xkbUtils.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbUtils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xkbUtils.c 23 Apr 2004 19:54:30 -0000 1.2
+++ xkbUtils.c 10 Jun 2004 19:42:11 -0000 1.3
@@ -26,6 +26,9 @@
********************************************************/
/* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.16 2003/11/03 05:12:02 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <ctype.h>
#include <math.h>
@@ -38,8 +41,8 @@
#include "inputstr.h"
#define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
-#include "extensions/XKBgeom.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
#include "xkb.h"
#ifdef MODE_SWITCH