[xserver-commit] xfree86/os-support/shared VTsw_noop.c,3.2,3.3 VTsw_usl.c,3.4,3.5 agp_noop.c,1.5,1.6 at_scancode.c,1.4,1.5 bios_devmem.c,3.7,3.8 bios_mmap.c,1.9,1.10 inout.S,1.1,1.2 ioperm_noop.c,3.4,3.5 kbd.c,1.3,1.4 kmod_noop.c,1.2,1.3 libc_wrapper.c,1.102,1.103 pm_noop.c,1.2,1.3 posix_tty.c,3.30,3.31 sigio.c,1.16,1.17 sigiostubs.c,1.4,1.5 stdPci.c,3.4,3.5 stdResource.c,1.22,1.23 std_kbdEv.c,3.3,3.4 sysv_kbd.c,3.4,3.5 vidmem.c,1.17,1.18 xf86Axp.c,1.3,1.4 xf86Axp.h,1.3,1.4

Daniel Stone xserver-commit@pdx.freedesktop.org


Committed by: daniel

Update of /cvs/xserver/xfree86/os-support/shared
In directory pdx:/home/daniel/src/xserver/hw/xfree86/os-support/shared

Modified Files:
	VTsw_noop.c VTsw_usl.c agp_noop.c at_scancode.c bios_devmem.c 
	bios_mmap.c inout.S ioperm_noop.c kbd.c kmod_noop.c 
	libc_wrapper.c pm_noop.c posix_tty.c sigio.c sigiostubs.c 
	stdPci.c stdResource.c std_kbdEv.c sysv_kbd.c vidmem.c 
	xf86Axp.c xf86Axp.h 
Log Message:
Checkin stage #4: everything else we've changed.

Index: VTsw_noop.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/VTsw_noop.c,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -d -r3.2 -r3.3
--- a/VTsw_noop.c	25 Jul 1998 16:56:59 -0000	3.2
+++ b/VTsw_noop.c	19 Feb 2004 03:51:39 -0000	3.3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.1.4.1 1998/06/05 16:23:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.2 1998/07/25 16:56:59 dawes Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
  *
@@ -23,7 +23,7 @@
  */
 /* $XConsortium: VTsw_noop.c /main/3 1996/02/21 17:53:25 kaleb $ */
 
-#include "X.h"
+#include <X11/X.h>
 
 #include "xf86.h"
 #include "xf86Priv.h"

Index: VTsw_usl.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/VTsw_usl.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- a/VTsw_usl.c	16 Sep 2002 18:06:14 -0000	3.4
+++ b/VTsw_usl.c	19 Feb 2004 03:51:39 -0000	3.5
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.1.4.1 1998/06/05 16:23:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.4 2002/09/16 18:06:14 eich Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
  *
@@ -23,7 +23,7 @@
  */
 /* $XConsortium: VTsw_usl.c /main/3 1996/02/21 17:53:28 kaleb $ */
 
-#include "X.h"
+#include <X11/X.h>
 
 #include "xf86.h"
 #include "xf86Priv.h"

Index: agp_noop.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/agp_noop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/agp_noop.c	24 Aug 2003 17:37:05 -0000	1.5
+++ b/agp_noop.c	19 Feb 2004 03:51:39 -0000	1.6
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/agp_noop.c,v 1.4 2003/03/25 04:18:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/agp_noop.c,v 1.5 2003/08/24 17:37:05 dawes Exp $ */
 /*
  * Copyright (c) 2000-2003 by The XFree86 Project, Inc.
  *
@@ -34,7 +34,7 @@
 #ifdef __UNIXOS2__
 # define I_NEED_OS2_H
 #endif
-#include "X.h"
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"

Index: at_scancode.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/at_scancode.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/at_scancode.c	24 Aug 2003 17:37:05 -0000	1.4
+++ b/at_scancode.c	19 Feb 2004 03:51:39 -0000	1.5
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c,v 1.3 2003/06/18 13:35:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c,v 1.4 2003/08/24 17:37:05 dawes Exp $ */
 /*
  * Copyright (c) 2002-2003 by The XFree86 Project, Inc.
  *

Index: bios_devmem.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/bios_devmem.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- a/bios_devmem.c	19 Sep 2000 12:46:22 -0000	3.7
+++ b/bios_devmem.c	19 Feb 2004 03:51:39 -0000	3.8
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.5 1998/09/13 00:51:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.7 2000/09/19 12:46:22 eich Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
  *
@@ -23,7 +23,7 @@
  */
 /* $XConsortium: bios_devmem.c /main/5 1996/10/19 18:07:41 kaleb $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"

Index: bios_mmap.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/bios_mmap.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/bios_mmap.c	23 May 2001 14:46:05 -0000	1.9
+++ b/bios_mmap.c	19 Feb 2004 03:51:39 -0000	1.10
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.8 2000/11/19 16:38:06 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.9 2001/05/23 14:46:05 alanh Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
  *
@@ -23,7 +23,7 @@
  */
 /* $XConsortium: bios_V4mmap.c /main/4 1996/02/21 17:54:27 kaleb $ */
 
-#include "X.h"
+#include <X11/X.h>
 
 #include "xf86.h"
 #include "xf86Priv.h"

Index: inout.S
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/inout.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/inout.S	10 Jul 1999 07:24:52 -0000	1.1
+++ b/inout.S	19 Feb 2004 03:51:39 -0000	1.2
@@ -4,7 +4,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s,v 3.5 1996/12/23 06:50:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.S,v 1.1 1999/07/10 07:24:52 dawes Exp $ */
 
 #include "assyntax.h"
 

Index: ioperm_noop.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/ioperm_noop.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- a/ioperm_noop.c	23 Jul 2001 13:15:48 -0000	3.4
+++ b/ioperm_noop.c	19 Feb 2004 03:51:39 -0000	3.5
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.3 1998/07/25 16:57:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.4 2001/07/23 13:15:48 dawes Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
  *
@@ -28,7 +28,7 @@
  * or the permissions are implicit with opening/enabling the console.
  */
 
-#include "X.h"
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"

Index: kbd.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/kbd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/kbd.c	24 Aug 2003 17:37:05 -0000	1.3
+++ b/kbd.c	19 Feb 2004 03:51:39 -0000	1.4
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/kbd.c,v 1.2 2003/02/17 15:11:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/kbd.c,v 1.3 2003/08/24 17:37:05 dawes Exp $ */
 /*
  * Copyright (c) 2001-2003 by The XFree86 Project, Inc.
  *

Index: kmod_noop.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/kmod_noop.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/kmod_noop.c	24 Aug 2003 17:37:05 -0000	1.2
+++ b/kmod_noop.c	19 Feb 2004 03:51:39 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/kmod_noop.c,v 1.2 2003/08/24 17:37:05 dawes Exp $ */
 /*
  * Copyright (c) 2000 by The XFree86 Project, Inc.
  *

Index: libc_wrapper.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/libc_wrapper.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- a/libc_wrapper.c	19 Nov 2003 03:52:58 -0000	1.102
+++ b/libc_wrapper.c	19 Feb 2004 03:51:39 -0000	1.103
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c,v 1.101 2003/10/28 18:36:37 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c,v 1.102 2003/11/19 03:52:58 dawes Exp $ */
 /*
  * Copyright 1997-2003 by The XFree86 Project, Inc.
  *
@@ -26,12 +26,9 @@
 #if defined(linux) && !defined(__GLIBC__)
 #undef __STRICT_ANSI__
 #endif
-#include <X.h>
-#ifdef __UNIXOS2__
-#define I_NEED_OS2_H
-#endif
-#include <Xmd.h>
-#include <Xos.h>
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xos.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #if defined(__bsdi__)
@@ -45,7 +42,7 @@
 #endif
 #include <stdarg.h>
 #include <fcntl.h>
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 #include "os.h"
 #include <ctype.h>
 #include <unistd.h>

Index: pm_noop.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/pm_noop.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/pm_noop.c	24 Aug 2003 17:37:06 -0000	1.2
+++ b/pm_noop.c	19 Feb 2004 03:51:39 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/pm_noop.c,v 1.1 2000/02/13 03:36:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/pm_noop.c,v 1.2 2003/08/24 17:37:06 dawes Exp $ */
 /*
  * Copyright (c) 2000 by The XFree86 Project, Inc.
  *
@@ -28,7 +28,7 @@
 
 /* Stubs for the OS-support layer power-management functions. */
 
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: posix_tty.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/posix_tty.c,v
retrieving revision 3.30
retrieving revision 3.31
diff -u -d -r3.30 -r3.31
--- a/posix_tty.c	24 Aug 2003 17:37:06 -0000	3.30
+++ b/posix_tty.c	19 Feb 2004 03:51:39 -0000	3.31
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c,v 3.29 2003/04/14 02:45:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c,v 3.30 2003/08/24 17:37:06 dawes Exp $ */
 /*
  * Copyright 1993-2003 by The XFree86 Project, Inc.
  *
@@ -55,7 +55,7 @@
 
 /* $XConsortium: posix_tty.c /main/7 1996/10/19 18:07:47 kaleb $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"

Index: sigio.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/sigio.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/sigio.c	4 Sep 2003 00:21:17 -0000	1.16
+++ b/sigio.c	19 Feb 2004 03:51:39 -0000	1.17
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sigio.c,v 1.15 2003/08/24 17:37:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sigio.c,v 1.16 2003/09/04 00:21:17 dawes Exp $ */
 
 /* sigio.c -- Support for SIGIO handler installation and removal
  * Created: Thu Jun  3 15:39:18 1999 by faith@precisioninsight.com
@@ -54,24 +54,13 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-#ifdef XFree86Server
-# include "X.h"
+# include <X11/X.h>
 # include "xf86.h"
 # include "xf86drm.h"
 # include "xf86Priv.h"
 # include "xf86_OSlib.h"
 # include "xf86drm.h"
 # include "inputstr.h"
-#else
-# include <unistd.h>
-# include <signal.h>
-# include <fcntl.h>
-# include <sys/time.h>
-# include <errno.h>
-# include <stdio.h>
-# include <string.h>
-# define SYSCALL(call) while(((call) == -1) && (errno == EINTR))
-#endif
 
 /*
  * Linux libc5 defines FASYNC, but not O_ASYNC.  Don't know if it is

Index: sigiostubs.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/sigiostubs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/sigiostubs.c	24 Aug 2003 17:37:06 -0000	1.4
+++ b/sigiostubs.c	19 Feb 2004 03:51:39 -0000	1.5
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c,v 1.3 2003/03/25 04:18:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c,v 1.4 2003/08/24 17:37:06 dawes Exp $ */
 /*
  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
  *
@@ -26,23 +26,12 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-#ifdef XFree86Server
-#ifdef __UNIXOS2__
-# define I_NEED_OS2_H
-#endif
-# include "X.h"
+# include <X11/X.h>
 # include "xf86.h"
 # include "xf86drm.h"
 # include "xf86Priv.h"
 # include "xf86_OSlib.h"
 # include "xf86drm.h"
-#else
-# include <unistd.h>
-# include <signal.h>
-# include <fcntl.h>
-# include <sys/time.h>
-# include <errno.h>
-#endif
 
 int
 xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure)

Index: stdPci.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/stdPci.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- a/stdPci.c	24 Aug 2003 17:37:06 -0000	3.4
+++ b/stdPci.c	19 Feb 2004 03:51:40 -0000	3.5
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/stdPci.c,v 3.3 2003/03/25 04:18:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/stdPci.c,v 3.4 2003/08/24 17:37:06 dawes Exp $ */
 /*
  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
  *
@@ -29,7 +29,7 @@
 #ifdef __UNIXOS2__
 # define I_NEED_OS2_H
 #endif
-#include "X.h"
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Privstr.h"

Index: stdResource.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/stdResource.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- a/stdResource.c	24 Aug 2003 17:37:06 -0000	1.22
+++ b/stdResource.c	19 Feb 2004 03:51:40 -0000	1.23
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c,v 1.21 2003/03/25 04:18:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c,v 1.22 2003/08/24 17:37:06 dawes Exp $ */
 /*
  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
  *
@@ -31,7 +31,7 @@
 #ifdef __UNIXOS2__
 # define I_NEED_OS2_H
 #endif
-#include "X.h"
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Privstr.h"

Index: std_kbdEv.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/std_kbdEv.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- a/std_kbdEv.c	7 May 1999 02:56:23 -0000	3.3
+++ b/std_kbdEv.c	19 Feb 2004 03:51:40 -0000	3.4
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.2 1998/07/25 16:57:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.3 1999/05/07 02:56:23 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Dawes <dawes@xfree86.org>
@@ -25,7 +25,7 @@
  */
 /* $XConsortium: std_kbdEv.c /main/4 1996/03/11 10:47:33 kaleb $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"

Index: sysv_kbd.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/sysv_kbd.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- a/sysv_kbd.c	14 Jan 1999 13:05:11 -0000	3.4
+++ b/sysv_kbd.c	19 Feb 2004 03:51:40 -0000	3.5
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.3 1998/07/25 16:57:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.4 1999/01/14 13:05:11 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Dawes <dawes@XFree86.org>
@@ -25,7 +25,7 @@
  */
 /* $XConsortium: sysv_kbd.c /main/3 1996/02/21 17:53:59 kaleb $ */
 
-#include "X.h"
+#include <X11/X.h>
 
 #include "compiler.h"
 

Index: vidmem.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/vidmem.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- a/vidmem.c	24 Aug 2003 17:37:06 -0000	1.17
+++ b/vidmem.c	19 Feb 2004 03:51:40 -0000	1.18
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/vidmem.c,v 1.16 2003/03/25 04:18:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/vidmem.c,v 1.17 2003/08/24 17:37:06 dawes Exp $ */
 /*
  * Copyright (c) 1993-2003 by The XFree86 Project, Inc.
  *
@@ -30,7 +30,7 @@
 #ifdef __UNIXOS2__
 # define I_NEED_OS2_H
 #endif
-#include "X.h"
+#include <X11/X.h>
 #include "input.h"
 #include "scrnintstr.h"
 

Index: xf86Axp.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/xf86Axp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/xf86Axp.c	24 Aug 2003 17:37:06 -0000	1.3
+++ b/xf86Axp.c	19 Feb 2004 03:51:40 -0000	1.4
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.c,v 1.2 2000/11/06 21:57:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.c,v 1.3 2003/08/24 17:37:06 dawes Exp $ */
 /*
  * Copyright (c) 2000 by The XFree86 Project, Inc.
  *

Index: xf86Axp.h
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/xf86Axp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/xf86Axp.h	15 Feb 2001 19:46:03 -0000	1.3
+++ b/xf86Axp.h	19 Feb 2004 03:51:40 -0000	1.4
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.h,v 1.3 2001/02/15 19:46:03 eich Exp $ */
 
 #ifndef _XF86_AXP_H_
 #define _XF86_AXP_H_