[xserver-commit] xfree86/os-support/shared VTsw_noop.c,3.3,3.4 VTsw_usl.c,3.5,3.6 agp_noop.c,1.6,1.7 at_scancode.c,1.5,1.6 bios_devmem.c,3.8,3.9 bios_mmap.c,1.10,1.11 ioperm_noop.c,3.5,3.6 kbd.c,1.4,1.5 kmod_noop.c,1.3,1.4 libc_wrapper.c,1.103,1.104 pm_noop.c,1.3,1.4 posix_tty.c,3.31,3.32 sigio.c,1.17,1.18 sigiostubs.c,1.5,1.6 stdPci.c,3.5,3.6 stdResource.c,1.23,1.24 std_kbdEv.c,3.4,3.5 sysv_kbd.c,3.5,3.6 vidmem.c,1.18,1.19 xf86Axp.c,1.4,1.5

Keith Packard xserver-commit@pdx.freedesktop.org


Committed by: keithp

Update of /cvs/xserver/xfree86/os-support/shared
In directory pdx:/tmp/cvs-serv14744/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 
Log Message:
	* Makefile.am
	* *.c
	Ok, everyone gets #include <config.h>
	Other than that, I fixed a few extension header paths and
	whacked at the Makefile.am.  Makefile.am is a hacked version
	of xserver/Makefile.am; expect them to diverge until we can
	stick the xfree86 DDX stuff into the standard Makefile.am.


Index: VTsw_noop.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/VTsw_noop.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- a/VTsw_noop.c	19 Feb 2004 03:51:39 -0000	3.3
+++ b/VTsw_noop.c	28 Feb 2004 01:28:00 -0000	3.4
@@ -23,6 +23,9 @@
  */
 /* $XConsortium: VTsw_noop.c /main/3 1996/02/21 17:53:25 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 
 #include "xf86.h"

Index: VTsw_usl.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/VTsw_usl.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- a/VTsw_usl.c	19 Feb 2004 03:51:39 -0000	3.5
+++ b/VTsw_usl.c	28 Feb 2004 01:28:00 -0000	3.6
@@ -23,6 +23,9 @@
  */
 /* $XConsortium: VTsw_usl.c /main/3 1996/02/21 17:53:28 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 
 #include "xf86.h"

Index: agp_noop.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/agp_noop.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/agp_noop.c	19 Feb 2004 03:51:39 -0000	1.6
+++ b/agp_noop.c	28 Feb 2004 01:28:00 -0000	1.7
@@ -31,6 +31,9 @@
  * AGP GART support.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __UNIXOS2__
 # define I_NEED_OS2_H
 #endif

Index: at_scancode.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/at_scancode.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/at_scancode.c	19 Feb 2004 03:51:39 -0000	1.5
+++ b/at_scancode.c	28 Feb 2004 01:28:00 -0000	1.6
@@ -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/xfree86/os-support/shared/bios_devmem.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- a/bios_devmem.c	19 Feb 2004 03:51:39 -0000	3.8
+++ b/bios_devmem.c	28 Feb 2004 01:28:00 -0000	3.9
@@ -23,6 +23,9 @@
  */
 /* $XConsortium: bios_devmem.c /main/5 1996/10/19 18:07:41 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"

Index: bios_mmap.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/bios_mmap.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/bios_mmap.c	19 Feb 2004 03:51:39 -0000	1.10
+++ b/bios_mmap.c	28 Feb 2004 01:28:00 -0000	1.11
@@ -23,6 +23,9 @@
  */
 /* $XConsortium: bios_V4mmap.c /main/4 1996/02/21 17:54:27 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 
 #include "xf86.h"

Index: ioperm_noop.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/ioperm_noop.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- a/ioperm_noop.c	19 Feb 2004 03:51:39 -0000	3.5
+++ b/ioperm_noop.c	28 Feb 2004 01:28:00 -0000	3.6
@@ -28,6 +28,9 @@
  * or the permissions are implicit with opening/enabling the console.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"

Index: kbd.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/kbd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/kbd.c	19 Feb 2004 03:51:39 -0000	1.4
+++ b/kbd.c	28 Feb 2004 01:28:00 -0000	1.5
@@ -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/xfree86/os-support/shared/kmod_noop.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/kmod_noop.c	19 Feb 2004 03:51:39 -0000	1.3
+++ b/kmod_noop.c	28 Feb 2004 01:28:00 -0000	1.4
@@ -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/xfree86/os-support/shared/libc_wrapper.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- a/libc_wrapper.c	19 Feb 2004 03:51:39 -0000	1.103
+++ b/libc_wrapper.c	28 Feb 2004 01:28:00 -0000	1.104
@@ -23,6 +23,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if defined(linux) && !defined(__GLIBC__)
 #undef __STRICT_ANSI__
 #endif

Index: pm_noop.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/pm_noop.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/pm_noop.c	19 Feb 2004 03:51:39 -0000	1.3
+++ b/pm_noop.c	28 Feb 2004 01:28:00 -0000	1.4
@@ -28,6 +28,9 @@
 
 /* Stubs for the OS-support layer power-management functions. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "os.h"
 #include "xf86.h"

Index: posix_tty.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/posix_tty.c,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -d -r3.31 -r3.32
--- a/posix_tty.c	19 Feb 2004 03:51:39 -0000	3.31
+++ b/posix_tty.c	28 Feb 2004 01:28:00 -0000	3.32
@@ -55,6 +55,9 @@
 
 /* $XConsortium: posix_tty.c /main/7 1996/10/19 18:07:47 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"

Index: sigio.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/sigio.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- a/sigio.c	19 Feb 2004 03:51:39 -0000	1.17
+++ b/sigio.c	28 Feb 2004 01:28:00 -0000	1.18
@@ -54,6 +54,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 # include <X11/X.h>
 # include "xf86.h"
 # include "xf86drm.h"

Index: sigiostubs.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/sigiostubs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/sigiostubs.c	19 Feb 2004 03:51:39 -0000	1.5
+++ b/sigiostubs.c	28 Feb 2004 01:28:00 -0000	1.6
@@ -26,6 +26,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 # include <X11/X.h>
 # include "xf86.h"
 # include "xf86drm.h"

Index: stdPci.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/stdPci.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- a/stdPci.c	19 Feb 2004 03:51:40 -0000	3.5
+++ b/stdPci.c	28 Feb 2004 01:28:00 -0000	3.6
@@ -26,6 +26,9 @@
  * 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

Index: stdResource.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/stdResource.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- a/stdResource.c	19 Feb 2004 03:51:40 -0000	1.23
+++ b/stdResource.c	28 Feb 2004 01:28:00 -0000	1.24
@@ -28,6 +28,9 @@
 
 /* Standard resource information code */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __UNIXOS2__
 # define I_NEED_OS2_H
 #endif

Index: std_kbdEv.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/std_kbdEv.c,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- a/std_kbdEv.c	19 Feb 2004 03:51:40 -0000	3.4
+++ b/std_kbdEv.c	28 Feb 2004 01:28:00 -0000	3.5
@@ -25,6 +25,9 @@
  */
 /* $XConsortium: std_kbdEv.c /main/4 1996/03/11 10:47:33 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"

Index: sysv_kbd.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/sysv_kbd.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- a/sysv_kbd.c	19 Feb 2004 03:51:40 -0000	3.5
+++ b/sysv_kbd.c	28 Feb 2004 01:28:00 -0000	3.6
@@ -25,6 +25,9 @@
  */
 /* $XConsortium: sysv_kbd.c /main/3 1996/02/21 17:53:59 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 
 #include "compiler.h"

Index: vidmem.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/vidmem.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- a/vidmem.c	19 Feb 2004 03:51:40 -0000	1.18
+++ b/vidmem.c	28 Feb 2004 01:28:00 -0000	1.19
@@ -27,6 +27,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __UNIXOS2__
 # define I_NEED_OS2_H
 #endif

Index: xf86Axp.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/shared/xf86Axp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/xf86Axp.c	19 Feb 2004 03:51:40 -0000	1.4
+++ b/xf86Axp.c	28 Feb 2004 01:28:00 -0000	1.5
@@ -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[] = {