[xserver-commit] xfree86/int10 Makefile.am,1.1,1.2 generic.c,1.30,1.31 helper_exec.c,1.28,1.29 helper_mem.c,1.27,1.28 pci.c,1.13,1.14 stub.c,1.5,1.6 xf86int10.c,1.12,1.13 xf86int10module.c,1.3,1.4 xf86x86emu.c,1.14,1.15

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xfree86/int10
In directory pdx:/tmp/cvs-serv14744/int10

Modified Files:
	Makefile.am generic.c helper_exec.c helper_mem.c pci.c stub.c 
	xf86int10.c xf86int10module.c xf86x86emu.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: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/int10/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/Makefile.am	19 Feb 2004 03:50:05 -0000	1.1
+++ b/Makefile.am	28 Feb 2004 01:27:51 -0000	1.2
@@ -2,8 +2,11 @@
 AM_CFLAGS = $(XF86_CFLAGS)
 
 lib_LIBRARIES = libxf86int10.a
-libxf86int10_a_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
-                         xf86int10.c xf86x86emu.c generic.c
+
+libxf86int10_a_SOURCES = stub.c
+
+#libxf86int10_a_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
+#                         xf86int10.c xf86x86emu.c generic.c
 
 sdk_INCLUDEDIR = $(includedir)/X11/XF86SDK
 sdk_INCLUDES = xf86int10.h

Index: generic.c
===================================================================
RCS file: /cvs/xserver/xfree86/int10/generic.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- a/generic.c	19 Feb 2004 03:51:37 -0000	1.30
+++ b/generic.c	28 Feb 2004 01:27:51 -0000	1.31
@@ -4,6 +4,9 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: helper_exec.c
===================================================================
RCS file: /cvs/xserver/xfree86/int10/helper_exec.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- a/helper_exec.c	19 Feb 2004 03:51:37 -0000	1.28
+++ b/helper_exec.c	28 Feb 2004 01:27:51 -0000	1.29
@@ -15,6 +15,9 @@
  * on PIO.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: helper_mem.c
===================================================================
RCS file: /cvs/xserver/xfree86/int10/helper_mem.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- a/helper_mem.c	19 Feb 2004 03:51:37 -0000	1.27
+++ b/helper_mem.c	28 Feb 2004 01:27:52 -0000	1.28
@@ -4,6 +4,9 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: pci.c
===================================================================
RCS file: /cvs/xserver/xfree86/int10/pci.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- a/pci.c	19 Feb 2004 03:51:37 -0000	1.13
+++ b/pci.c	28 Feb 2004 01:27:52 -0000	1.14
@@ -5,6 +5,9 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86Pci.h"
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: stub.c
===================================================================
RCS file: /cvs/xserver/xfree86/int10/stub.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/stub.c	19 Feb 2004 03:51:37 -0000	1.5
+++ b/stub.c	28 Feb 2004 01:27:52 -0000	1.6
@@ -4,6 +4,9 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86str.h"
 #include "xf86_OSproc.h"

Index: xf86int10.c
===================================================================
RCS file: /cvs/xserver/xfree86/int10/xf86int10.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/xf86int10.c	19 Feb 2004 03:51:37 -0000	1.12
+++ b/xf86int10.c	28 Feb 2004 01:27:52 -0000	1.13
@@ -5,6 +5,9 @@
  *                 Copyright 1999 Egbert Eich
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "compiler.h"

Index: xf86int10module.c
===================================================================
RCS file: /cvs/xserver/xfree86/int10/xf86int10module.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/xf86int10module.c	19 Feb 2004 03:51:37 -0000	1.3
+++ b/xf86int10module.c	28 Feb 2004 01:27:52 -0000	1.4
@@ -4,6 +4,9 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86str.h"
 #include "xf86Pci.h"

Index: xf86x86emu.c
===================================================================
RCS file: /cvs/xserver/xfree86/int10/xf86x86emu.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/xf86x86emu.c	19 Feb 2004 03:51:37 -0000	1.14
+++ b/xf86x86emu.c	28 Feb 2004 01:27:52 -0000	1.15
@@ -4,6 +4,9 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <x86emu.h>
 #include "xf86.h"
 #include "xf86_ansic.h"