debrix/hw/xorg/os-support/linux agpgart.h, 1.2, 1.3 lnx.h, 1.2, 1.3 lnxResource.c, 1.2, 1.3 lnx_KbdMap.c, 1.2, 1.3 lnx_agp.c, 1.2, 1.3 lnx_apm.c, 1.2, 1.3 lnx_axp.c, 1.2, 1.3 lnx_ev56.c, 1.2, 1.3 lnx_init.c, 1.2, 1.3 lnx_io.c, 1.2, 1.3 lnx_jstk.c, 1.2, 1.3 lnx_kbd.c, 1.2, 1.3 lnx_kmod.c, 1.2, 1.3 lnx_mouse.c, 1.1.1.2, 1.2 lnx_pci.c, 1.2, 1.3 lnx_video.c, 1.2, 1.3

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	agpgart.h lnx.h lnxResource.c lnx_KbdMap.c lnx_agp.c lnx_apm.c 
	lnx_axp.c lnx_ev56.c lnx_init.c lnx_io.c lnx_jstk.c lnx_kbd.c 
	lnx_kmod.c lnx_mouse.c lnx_pci.c lnx_video.c 
Log Message:
Initial import from modular sources.


Index: agpgart.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/agpgart.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- agpgart.h	23 Apr 2004 19:54:08 -0000	1.2
+++ agpgart.h	10 Jun 2004 19:40:55 -0000	1.3
@@ -25,6 +25,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/agpgart.h,v 1.3 2000/06/17 00:03:33 martin Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _AGP_H
 #define _AGP_H 1
 

Index: lnx.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx.h	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx.h	10 Jun 2004 19:40:55 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef LNX_H_
 # ifdef __alpha__
 extern unsigned long _bus_base __P ((void)) __attribute__ ((const));

Index: lnxResource.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnxResource.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnxResource.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnxResource.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -2,7 +2,10 @@
 
 /* Resource information code */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Privstr.h"

Index: lnx_KbdMap.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_KbdMap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_KbdMap.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_KbdMap.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -6,8 +6,11 @@
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  */
 
-#include "X.h"
-#include "Xmd.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "input.h"
 #include "scrnintstr.h"
 
@@ -21,7 +24,7 @@
 #include "atKeynames.h"
 
 #include "xf86Keymap.h"
-#include "DECkeysym.h"
+#include <X11/DECkeysym.h>
 
 #include "lnx_kbd.h"
 

Index: lnx_agp.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_agp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_agp.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_agp.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -9,7 +9,10 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.11 2003/04/03 22:47:42 dawes Exp $ */
 
-#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: lnx_apm.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_apm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_apm.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_apm.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.12 2001/12/24 22:54:31 dawes Exp $ */
 
-#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: lnx_axp.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_axp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_axp.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_axp.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -1,7 +1,10 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.3 2001/02/15 11:03:56 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: lnx_ev56.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_ev56.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_ev56.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_ev56.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.5 2000/02/17 13:45:49 dawes Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "input.h"
 #include "scrnintstr.h"
 #include "compiler.h"

Index: lnx_init.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_init.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_init.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_init.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -26,8 +26,11 @@
  */
 /* $XConsortium: lnx_init.c /main/7 1996/10/23 18:46:30 kaleb $ */
 
-#include "X.h"
-#include "Xmd.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xmd.h>
 
 #include "compiler.h"
 

Index: lnx_io.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_io.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_io.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_io.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -1,4 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.25 2003/08/19 17:32:34 tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 1.1.4.2.6.2 2004/03/04 17:48:09 eich Exp $ */
 /*
  * Copyright 1992 by Orest Zborowski <obz at Kodak.com>
  * Copyright 1993 by David Dawes <dawes at xfree86.org>
@@ -25,8 +26,11 @@
  */
 /* $XConsortium: lnx_io.c /main/8 1996/10/19 18:06:28 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
 
 #include "compiler.h"
 

Index: lnx_jstk.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_jstk.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_jstk.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_jstk.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -27,6 +27,9 @@
 
 static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp";
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <unistd.h>
 #include <string.h>

Index: lnx_kbd.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_kbd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_kbd.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_kbd.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -1,4 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.4 2003/11/03 05:11:52 tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.1.4.1.6.2 2004/03/04 17:48:09 eich Exp $ */
 
 /*
  * Copyright (c) 2002 by The XFree86 Project, Inc.
@@ -9,8 +10,11 @@
  * Copyright 1993 by David Dawes <dawes at xfree86.org>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
 
 #include "compiler.h"
 

Index: lnx_kmod.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_kmod.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_kmod.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_kmod.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.5 2001/10/01 13:44:14 eich Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>

Index: lnx_mouse.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_mouse.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- lnx_mouse.c	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ lnx_mouse.c	10 Jun 2004 19:40:55 -0000	1.2
@@ -4,7 +4,10 @@
  * Copyright 1999 by The XFree86 Project, Inc.
  */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Xinput.h"
 #include "xf86OSmouse.h"

Index: lnx_pci.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_pci.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_pci.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_pci.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -1,7 +1,10 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.8 2002/04/09 15:59:37 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: lnx_video.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_video.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lnx_video.c	23 Apr 2004 19:54:08 -0000	1.2
+++ lnx_video.c	10 Jun 2004 19:40:55 -0000	1.3
@@ -25,7 +25,10 @@
  */
 /* $XConsortium: lnx_video.c /main/9 1996/10/19 18:06:34 kaleb $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "input.h"
 #include "scrnintstr.h"