debrix/hw/xorg/os-support/shared VTsw_noop.c, 1.2, 1.3 VTsw_usl.c, 1.2, 1.3 agp_noop.c, 1.1.1.2, 1.2 at_scancode.c, 1.1.1.2, 1.2 bios_devmem.c, 1.2, 1.3 bios_mmap.c, 1.2, 1.3 ioperm_noop.c, 1.2, 1.3 kbd.c, 1.1.1.2, 1.2 kmod_noop.c, 1.1.1.2, 1.2 libc_wrapper.c, 1.2, 1.3 pm_noop.c, 1.1.1.2, 1.2 posix_tty.c, 1.1.1.2, 1.2 sigio.c, 1.1.1.2, 1.2 sigiostubs.c, 1.1.1.2, 1.2 stdPci.c, 1.1.1.2, 1.2 stdResource.c, 1.1.1.2, 1.2 std_kbdEv.c, 1.2, 1.3 sysv_kbd.c, 1.2, 1.3 vidmem.c, 1.1.1.2, 1.2 xf86Axp.c, 1.1.1.2, 1.2 xf86Axp.h, 1.2, 1.3

Daniel Stone xserver-commit at pdx.freedesktop.org
Fri Jun 11 05:41:11 EST 2004 

Committed by: daniel

Update of /cvs/xserver/debrix/hw/xorg/os-support/shared
In directory pdx:/home/daniel/x/debrix/debrix/hw/xorg/os-support/shared

Modified Files:
	VTsw_noop.c VTsw_usl.c agp_noop.c at_scancode.c bios_devmem.c 
	bios_mmap.c 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:
Initial import from modular sources.


Index: VTsw_noop.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/VTsw_noop.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VTsw_noop.c	23 Apr 2004 19:54:12 -0000	1.2
+++ VTsw_noop.c	10 Jun 2004 19:41:08 -0000	1.3
@@ -23,7 +23,10 @@
  */
 /* $XConsortium: VTsw_noop.c /main/3 1996/02/21 17:53:25 kaleb $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 
 #include "xf86.h"
 #include "xf86Priv.h"

Index: VTsw_usl.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/VTsw_usl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VTsw_usl.c	23 Apr 2004 19:54:12 -0000	1.2
+++ VTsw_usl.c	10 Jun 2004 19:41:08 -0000	1.3
@@ -23,7 +23,10 @@
  */
 /* $XConsortium: VTsw_usl.c /main/3 1996/02/21 17:53:28 kaleb $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 
 #include "xf86.h"
 #include "xf86Priv.h"

Index: agp_noop.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/agp_noop.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- agp_noop.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ agp_noop.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -31,10 +31,13 @@
  * AGP GART support.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/os-support/shared/at_scancode.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- at_scancode.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ at_scancode.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -26,6 +26,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86Xinput.h"
 #include "xf86OSKbd.h"

Index: bios_devmem.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/bios_devmem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bios_devmem.c	23 Apr 2004 19:54:12 -0000	1.2
+++ bios_devmem.c	10 Jun 2004 19:41:08 -0000	1.3
@@ -23,7 +23,10 @@
  */
 /* $XConsortium: bios_devmem.c /main/5 1996/10/19 18:07:41 kaleb $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"

Index: bios_mmap.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/bios_mmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bios_mmap.c	23 Apr 2004 19:54:12 -0000	1.2
+++ bios_mmap.c	10 Jun 2004 19:41:08 -0000	1.3
@@ -23,7 +23,10 @@
  */
 /* $XConsortium: bios_V4mmap.c /main/4 1996/02/21 17:54:27 kaleb $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 
 #include "xf86.h"
 #include "xf86Priv.h"

Index: ioperm_noop.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/ioperm_noop.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ioperm_noop.c	23 Apr 2004 19:54:12 -0000	1.2
+++ ioperm_noop.c	10 Jun 2004 19:41:08 -0000	1.3
@@ -28,7 +28,10 @@
  * or the permissions are implicit with opening/enabling the console.
  */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"

Index: kbd.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/kbd.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- kbd.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ kbd.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -26,6 +26,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86OSKbd.h"
 
 Bool

Index: kmod_noop.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/kmod_noop.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- kmod_noop.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ kmod_noop.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -26,6 +26,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86_OSproc.h"
 
 int xf86LoadKernelModule(const char *pathname)

Index: libc_wrapper.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/libc_wrapper.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libc_wrapper.c	23 Apr 2004 19:54:12 -0000	1.2
+++ libc_wrapper.c	10 Jun 2004 19:41:08 -0000	1.3
@@ -23,15 +23,18 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +48,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/debrix/hw/xorg/os-support/shared/pm_noop.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- pm_noop.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ pm_noop.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -28,7 +28,10 @@
 
 /* Stubs for the OS-support layer power-management functions. */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: posix_tty.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/posix_tty.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- posix_tty.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ posix_tty.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -55,7 +55,10 @@
 
 /* $XConsortium: posix_tty.c /main/7 1996/10/19 18:07:47 kaleb $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"

Index: sigio.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/sigio.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- sigio.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ sigio.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -54,8 +54,11 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XFree86Server
-# include "X.h"
+# include <X11/X.h>
 # include "xf86.h"
 # include "xf86drm.h"
 # include "xf86Priv.h"

Index: sigiostubs.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/sigiostubs.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- sigiostubs.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ sigiostubs.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -26,11 +26,14 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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"

Index: stdPci.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/stdPci.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- stdPci.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ stdPci.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -26,10 +26,13 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/os-support/shared/stdResource.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- stdResource.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ stdResource.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -28,10 +28,13 @@
 
 /* Standard resource information code */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/os-support/shared/std_kbdEv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- std_kbdEv.c	23 Apr 2004 19:54:12 -0000	1.2
+++ std_kbdEv.c	10 Jun 2004 19:41:08 -0000	1.3
@@ -25,7 +25,10 @@
  */
 /* $XConsortium: std_kbdEv.c /main/4 1996/03/11 10:47:33 kaleb $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"

Index: sysv_kbd.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/sysv_kbd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sysv_kbd.c	23 Apr 2004 19:54:12 -0000	1.2
+++ sysv_kbd.c	10 Jun 2004 19:41:08 -0000	1.3
@@ -25,7 +25,10 @@
  */
 /* $XConsortium: sysv_kbd.c /main/3 1996/02/21 17:53:59 kaleb $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 
 #include "compiler.h"
 

Index: vidmem.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/vidmem.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- vidmem.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ vidmem.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -27,10 +27,13 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/os-support/shared/xf86Axp.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Axp.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ xf86Axp.c	10 Jun 2004 19:41:08 -0000	1.2
@@ -26,6 +26,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86Axp.h"
 
 axpParams xf86AXPParams[] = { 

Index: xf86Axp.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/xf86Axp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86Axp.h	23 Apr 2004 19:54:12 -0000	1.2
+++ xf86Axp.h	10 Jun 2004 19:41:08 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86_AXP_H_
 #define _XF86_AXP_H_

More information about the xserver-commit mailing list