summaryrefslogtreecommitdiff
path: root/hw/xfree86/os-support/shared
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/os-support/shared')
-rw-r--r--hw/xfree86/os-support/shared/VTsw_noop.c4
-rw-r--r--hw/xfree86/os-support/shared/VTsw_usl.c2
-rw-r--r--hw/xfree86/os-support/shared/agp_noop.c2
-rw-r--r--hw/xfree86/os-support/shared/bios_devmem.c4
-rw-r--r--hw/xfree86/os-support/shared/bios_mmap.c4
-rw-r--r--hw/xfree86/os-support/shared/ioperm_noop.c2
-rw-r--r--hw/xfree86/os-support/shared/libc_wrapper.c8
-rw-r--r--hw/xfree86/os-support/shared/pm_noop.c2
-rw-r--r--hw/xfree86/os-support/shared/posix_tty.c2
-rw-r--r--hw/xfree86/os-support/shared/sigio.c2
-rw-r--r--hw/xfree86/os-support/shared/sigiostubs.c4
-rw-r--r--hw/xfree86/os-support/shared/stdPci.c2
-rw-r--r--hw/xfree86/os-support/shared/stdResource.c2
-rw-r--r--hw/xfree86/os-support/shared/std_kbdEv.c4
-rw-r--r--hw/xfree86/os-support/shared/sysv_kbd.c4
-rw-r--r--hw/xfree86/os-support/shared/vidmem.c2
16 files changed, 25 insertions, 25 deletions
diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c
index 265a45f91..795a65610 100644
--- a/hw/xfree86/os-support/shared/VTsw_noop.c
+++ b/hw/xfree86/os-support/shared/VTsw_noop.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.2 1998/07/25 16:56:59 dawes Exp $ */
+/* $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 $ */
/*
* 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"
diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c
index cad9e8583..3c0ca6b6e 100644
--- a/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -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"
diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c
index 5da36fa19..8c2da5166 100644
--- a/hw/xfree86/os-support/shared/agp_noop.c
+++ b/hw/xfree86/os-support/shared/agp_noop.c
@@ -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"
diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c
index 5c24b9751..5e516221d 100644
--- a/hw/xfree86/os-support/shared/bios_devmem.c
+++ b/hw/xfree86/os-support/shared/bios_devmem.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.7 2000/09/19 12:46:22 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.5 1998/09/13 00:51:32 dawes 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"
diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c
index ee7584222..c5cb404eb 100644
--- a/hw/xfree86/os-support/shared/bios_mmap.c
+++ b/hw/xfree86/os-support/shared/bios_mmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.9 2001/05/23 14:46:05 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.8 2000/11/19 16:38:06 tsi 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"
diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c
index c1af992c1..af5724cf1 100644
--- a/hw/xfree86/os-support/shared/ioperm_noop.c
+++ b/hw/xfree86/os-support/shared/ioperm_noop.c
@@ -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"
diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c
index cd92886ff..64d2de967 100644
--- a/hw/xfree86/os-support/shared/libc_wrapper.c
+++ b/hw/xfree86/os-support/shared/libc_wrapper.c
@@ -26,12 +26,12 @@
#if defined(linux) && !defined(__GLIBC__)
#undef __STRICT_ANSI__
#endif
-#include <X.h>
+#include <X11/X.h>
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
-#include <Xmd.h>
-#include <Xos.h>
+#include <X11/Xmd.h>
+#include <X11/Xos.h>
#include <sys/types.h>
#include <sys/stat.h>
#if defined(__bsdi__)
@@ -45,7 +45,7 @@
#endif
#include <stdarg.h>
#include <fcntl.h>
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
#include "os.h"
#include <ctype.h>
#include <unistd.h>
diff --git a/hw/xfree86/os-support/shared/pm_noop.c b/hw/xfree86/os-support/shared/pm_noop.c
index b5f4941bc..5e8efe330 100644
--- a/hw/xfree86/os-support/shared/pm_noop.c
+++ b/hw/xfree86/os-support/shared/pm_noop.c
@@ -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"
diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
index 1812729c0..362c8bcdc 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -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"
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
index 7bcb93a0b..3fef72e17 100644
--- a/hw/xfree86/os-support/shared/sigio.c
+++ b/hw/xfree86/os-support/shared/sigio.c
@@ -55,7 +55,7 @@
*/
#ifdef XFree86Server
-# include "X.h"
+# include <X11/X.h>
# include "xf86.h"
# include "xf86drm.h"
# include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c
index de2d20a4c..6c78cf71a 100644
--- a/hw/xfree86/os-support/shared/sigiostubs.c
+++ b/hw/xfree86/os-support/shared/sigiostubs.c
@@ -25,13 +25,13 @@
* the sale, use or other dealings in this Software without prior written
* authorization from the copyright holder(s) and author(s).
*/
-/* $XdotOrg: $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c,v 1.2 2004/06/28 18:08:26 alanc Exp $ */
#ifdef XFree86Server
#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"
diff --git a/hw/xfree86/os-support/shared/stdPci.c b/hw/xfree86/os-support/shared/stdPci.c
index fd60ec509..ba0574f24 100644
--- a/hw/xfree86/os-support/shared/stdPci.c
+++ b/hw/xfree86/os-support/shared/stdPci.c
@@ -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"
diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c
index df781c371..72ab99849 100644
--- a/hw/xfree86/os-support/shared/stdResource.c
+++ b/hw/xfree86/os-support/shared/stdResource.c
@@ -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"
diff --git a/hw/xfree86/os-support/shared/std_kbdEv.c b/hw/xfree86/os-support/shared/std_kbdEv.c
index 329346910..2a030c3dc 100644
--- a/hw/xfree86/os-support/shared/std_kbdEv.c
+++ b/hw/xfree86/os-support/shared/std_kbdEv.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.3 1999/05/07 02:56:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.2 1998/07/25 16:57:01 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"
diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c
index 1bb2da386..5421b11c3 100644
--- a/hw/xfree86/os-support/shared/sysv_kbd.c
+++ b/hw/xfree86/os-support/shared/sysv_kbd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.4 1999/01/14 13:05:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.3 1998/07/25 16:57:02 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"
diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c
index aed735680..29c8a2171 100644
--- a/hw/xfree86/os-support/shared/vidmem.c
+++ b/hw/xfree86/os-support/shared/vidmem.c
@@ -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"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 20:55:53 +0000