[xserver-commit] xserver/Xi allowev.c,3.4,3.5 chgdctl.c,3.4,3.5 chgfctl.c,3.4,3.5 chgkbd.c,3.6,3.7 chgkmap.c,3.3,3.4 chgprop.c,3.3,3.4 chgptr.c,3.7,3.8 closedev.c,3.4,3.5 devbell.c,3.3,3.4 exevents.c,3.11,3.12 extinit.c,3.7,3.8 getbmap.c,3.3,3.4 getdctl.c,3.4,3.5 getfctl.c,3.4,3.5 getfocus.c,3.3,3.4 getkmap.c,3.4,3.5 getmmap.c,3.3,3.4 getprop.c,3.6,3.7 getselev.c,3.6,3.7 getvers.c,3.3,3.4 grabdev.c,3.3,3.4 grabdevb.c,3.3,3.4 grabdevk.c,3.3,3.4 gtmotion.c,3.7,3.8 listdev.c,3.4,3.5 opendev.c,3.3,3.4 queryst.c,3.5,3.6 selectev.c,3.3,3.4 sendexev.c,3.3,3.4 setbmap.c,3.3,3.4 setdval.c,3.3,3.4 setfocus.c,3.3,3.4 setmmap.c,3.3,3.4 setmode.c,3.3,3.4 stubs.c,3.5,3.6 ungrdev.c,3.3,3.4 ungrdevb.c,3.4,3.5 ungrdevk.c,3.4,3.5
Warren Turkal
xserver-commit@pdx.freedesktop.org
Committed by: wt
Update of /cvs/xserver/xserver/Xi
In directory pdx:/tmp/cvs-serv15633
Modified Files:
allowev.c chgdctl.c chgfctl.c chgkbd.c chgkmap.c chgprop.c
chgptr.c closedev.c devbell.c exevents.c extinit.c getbmap.c
getdctl.c getfctl.c getfocus.c getkmap.c getmmap.c getprop.c
getselev.c getvers.c grabdev.c grabdevb.c grabdevk.c
gtmotion.c listdev.c opendev.c queryst.c selectev.c sendexev.c
setbmap.c setdval.c setfocus.c setmmap.c setmode.c stubs.c
ungrdev.c ungrdevb.c ungrdevk.c
Log Message:
change includes to be nonlocal
for example:
#include "X.h"
gets transformed to:
#include <X11/X.h>
Index: allowev.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/allowev.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- allowev.c 14 Dec 2001 19:58:54 -0000 3.4
+++ allowev.c 14 Feb 2004 04:50:32 -0000 3.5
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
Index: chgdctl.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgdctl.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- chgdctl.c 14 Dec 2001 19:58:54 -0000 3.4
+++ chgdctl.c 14 Feb 2004 04:50:32 -0000 3.5
@@ -55,11 +55,11 @@
#define NEED_EVENTS /* for inputstr.h */
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h" /* control constants */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h> /* control constants */
#include "XIstubs.h"
#include "extnsionst.h"
Index: chgfctl.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgfctl.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- chgfctl.c 14 Dec 2001 19:58:54 -0000 3.4
+++ chgfctl.c 14 Feb 2004 04:50:32 -0000 3.5
@@ -55,11 +55,11 @@
#define NEED_EVENTS /* for inputstr.h */
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h" /* control constants */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h> /* control constants */
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
Index: chgkbd.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgkbd.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- chgkbd.c 14 Dec 2001 19:58:54 -0000 3.6
+++ chgkbd.c 14 Feb 2004 04:50:32 -0000 3.7
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "XIstubs.h"
#include "globals.h"
#include "extnsionst.h"
Index: chgkmap.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgkmap.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- chgkmap.c 14 Dec 2001 19:58:55 -0000 3.3
+++ chgkmap.c 14 Feb 2004 04:50:32 -0000 3.4
@@ -55,11 +55,11 @@
#define NEED_EVENTS /* for inputstr.h */
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exevents.h"
Index: chgprop.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgprop.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- chgprop.c 14 Dec 2001 19:58:55 -0000 3.3
+++ chgprop.c 14 Feb 2004 04:50:32 -0000 3.4
@@ -55,12 +55,12 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h"
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
Index: chgptr.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/chgptr.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- chgptr.c 14 Dec 2001 19:58:55 -0000 3.7
+++ chgptr.c 14 Feb 2004 04:50:32 -0000 3.8
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "XIstubs.h"
#include "windowstr.h" /* window structure */
#include "scrnintstr.h" /* screen structure */
Index: closedev.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/closedev.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- closedev.c 14 Dec 2001 19:58:55 -0000 3.4
+++ closedev.c 14 Feb 2004 04:50:32 -0000 3.5
@@ -55,13 +55,13 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
#include "scrnintstr.h" /* screen structure */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "XIstubs.h"
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
Index: devbell.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/devbell.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- devbell.c 14 Dec 2001 19:58:55 -0000 3.3
+++ devbell.c 14 Feb 2004 04:50:32 -0000 3.4
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: exevents.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/exevents.c,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -d -r3.11 -r3.12
--- exevents.c 17 Nov 2003 22:20:29 -0000 3.11
+++ exevents.c 14 Feb 2004 04:50:32 -0000 3.12
@@ -55,10 +55,10 @@
*/
#define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "inputstr.h"
#include "windowstr.h"
#include "miscstruct.h"
Index: extinit.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/extinit.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- extinit.c 17 Nov 2003 22:20:29 -0000 3.7
+++ extinit.c 14 Feb 2004 04:50:33 -0000 3.8
@@ -57,13 +57,13 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
#include "inputstr.h"
#include "gcstruct.h" /* pointer for extnsionst.h*/
#include "extnsionst.h" /* extension entry */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "dixevents.h"
#include "exevents.h"
Index: getbmap.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/getbmap.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- getbmap.c 14 Dec 2001 19:58:56 -0000 3.3
+++ getbmap.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: getdctl.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/getdctl.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- getdctl.c 14 Dec 2001 19:58:56 -0000 3.4
+++ getdctl.c 14 Feb 2004 04:50:33 -0000 3.5
@@ -55,11 +55,11 @@
#define NEED_EVENTS /* for inputstr.h */
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: getfctl.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/getfctl.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- getfctl.c 14 Dec 2001 19:58:56 -0000 3.4
+++ getfctl.c 14 Feb 2004 04:50:33 -0000 3.5
@@ -55,11 +55,11 @@
#define NEED_EVENTS /* for inputstr.h */
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: getfocus.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/getfocus.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- getfocus.c 14 Dec 2001 19:58:56 -0000 3.3
+++ getfocus.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,12 +55,12 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "windowstr.h" /* focus struct */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: getkmap.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/getkmap.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- getkmap.c 14 Dec 2001 19:58:56 -0000 3.4
+++ getkmap.c 14 Feb 2004 04:50:33 -0000 3.5
@@ -55,11 +55,11 @@
#define NEED_EVENTS /* for inputstr.h */
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: getmmap.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/getmmap.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- getmmap.c 14 Dec 2001 19:58:57 -0000 3.3
+++ getmmap.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,11 +55,11 @@
#define NEED_EVENTS /* for inputstr.h */
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h" /* Request macro */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h> /* Request macro */
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: getprop.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/getprop.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- getprop.c 14 Dec 2001 19:58:57 -0000 3.6
+++ getprop.c 14 Feb 2004 04:50:33 -0000 3.7
@@ -55,12 +55,12 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structs */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: getselev.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/getselev.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- getselev.c 14 Dec 2001 19:58:57 -0000 3.6
+++ getselev.c 14 Feb 2004 04:50:33 -0000 3.7
@@ -55,10 +55,10 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window struct */
#include "extnsionst.h"
Index: getvers.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/getvers.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- getvers.c 14 Dec 2001 19:58:57 -0000 3.3
+++ getvers.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: grabdev.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/grabdev.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- grabdev.c 14 Dec 2001 19:58:57 -0000 3.3
+++ grabdev.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -56,12 +56,12 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: grabdevb.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/grabdevb.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- grabdevb.c 14 Dec 2001 19:58:57 -0000 3.3
+++ grabdevb.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,12 +55,12 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "exevents.h"
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
Index: grabdevk.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/grabdevk.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- grabdevk.c 14 Dec 2001 19:58:57 -0000 3.3
+++ grabdevk.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,12 +55,12 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "exevents.h"
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
Index: gtmotion.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/gtmotion.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- gtmotion.c 14 Dec 2001 19:58:57 -0000 3.7
+++ gtmotion.c 14 Feb 2004 04:50:33 -0000 3.8
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exevents.h"
Index: listdev.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/listdev.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- listdev.c 14 Dec 2001 19:58:58 -0000 3.4
+++ listdev.c 14 Feb 2004 04:50:33 -0000 3.5
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "XIstubs.h"
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
Index: opendev.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/opendev.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- opendev.c 14 Dec 2001 19:58:58 -0000 3.3
+++ opendev.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "XIstubs.h"
#include "windowstr.h" /* window structure */
#include "extnsionst.h"
Index: queryst.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/queryst.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- queryst.c 14 Dec 2001 19:58:58 -0000 3.5
+++ queryst.c 14 Feb 2004 04:50:33 -0000 3.6
@@ -36,12 +36,12 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exevents.h"
Index: selectev.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/selectev.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- selectev.c 14 Dec 2001 19:58:58 -0000 3.3
+++ selectev.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -56,12 +56,12 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exevents.h"
Index: sendexev.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/sendexev.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- sendexev.c 14 Dec 2001 19:58:58 -0000 3.3
+++ sendexev.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -56,12 +56,12 @@
#define EXTENSION_EVENT_BASE 64
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* Window */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exevents.h"
Index: setbmap.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/setbmap.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- setbmap.c 14 Dec 2001 19:58:59 -0000 3.3
+++ setbmap.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -58,11 +58,11 @@
#define IsOn(ptr, bit) \
(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "exevents.h"
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
Index: setdval.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/setdval.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- setdval.c 14 Dec 2001 19:58:59 -0000 3.3
+++ setdval.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "XIstubs.h"
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
Index: setfocus.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/setfocus.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- setfocus.c 14 Dec 2001 19:58:59 -0000 3.3
+++ setfocus.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,12 +55,12 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "windowstr.h" /* focus struct */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "dixevents.h"
Index: setmmap.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/setmmap.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- setmmap.c 14 Dec 2001 19:58:59 -0000 3.3
+++ setmmap.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,11 +55,11 @@
#define NEED_EVENTS /* for inputstr.h */
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "exevents.h"
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
Index: setmode.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/setmode.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- setmode.c 14 Dec 2001 19:58:59 -0000 3.3
+++ setmode.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "XIstubs.h"
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
Index: stubs.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/stubs.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- stubs.c 17 Nov 2003 22:20:30 -0000 3.5
+++ stubs.c 14 Feb 2004 04:50:33 -0000 3.6
@@ -58,11 +58,11 @@
*/
#define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
#include "inputstr.h"
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "XIstubs.h"
/***********************************************************************
Index: ungrdev.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/ungrdev.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- ungrdev.c 14 Dec 2001 19:58:59 -0000 3.3
+++ ungrdev.c 14 Feb 2004 04:50:33 -0000 3.4
@@ -55,11 +55,11 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: ungrdevb.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/ungrdevb.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- ungrdevb.c 14 Dec 2001 19:59:00 -0000 3.4
+++ ungrdevb.c 14 Feb 2004 04:50:33 -0000 3.5
@@ -55,12 +55,12 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
Index: ungrdevk.c
===================================================================
RCS file: /cvs/xserver/xserver/Xi/ungrdevk.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- ungrdevk.c 14 Dec 2001 19:59:00 -0000 3.4
+++ ungrdevk.c 14 Feb 2004 04:50:33 -0000 3.5
@@ -55,12 +55,12 @@
#define NEED_EVENTS
#define NEED_REPLIES
-#include "X.h" /* for inputstr.h */
-#include "Xproto.h" /* Request macro */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"