[xserver-commit] xfree86/os-support/linux/drm drmmodule.c,1.4,1.5 xf86drm.c,1.37,1.38 xf86drmCompat.c,1.5,1.6 xf86drmHash.c,1.5,1.6 xf86drmRandom.c,1.5,1.6 xf86drmSL.c,1.5,1.6

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xfree86/os-support/linux/drm
In directory pdx:/tmp/cvs-serv14744/os-support/linux/drm

Modified Files:
	drmmodule.c xf86drm.c xf86drmCompat.c xf86drmHash.c 
	xf86drmRandom.c xf86drmSL.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: drmmodule.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/drmmodule.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/drmmodule.c	19 Feb 2004 03:51:38 -0000	1.4
+++ b/drmmodule.c	28 Feb 2004 01:27:59 -0000	1.5
@@ -29,6 +29,9 @@
  * 
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86Module.h"
 
 static MODULESETUPPROTO(drmSetup);

Index: xf86drm.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/xf86drm.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- a/xf86drm.c	19 Feb 2004 03:51:38 -0000	1.37
+++ b/xf86drm.c	28 Feb 2004 01:27:59 -0000	1.38
@@ -33,6 +33,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.36 2003/08/24 17:35:35 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XFree86Server
 # include "xf86.h"
 # include "xf86_OSproc.h"

Index: xf86drmCompat.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/xf86drmCompat.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/xf86drmCompat.c	19 Feb 2004 03:51:38 -0000	1.5
+++ b/xf86drmCompat.c	28 Feb 2004 01:27:59 -0000	1.6
@@ -28,6 +28,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c,v 1.4 2003/12/30 22:11:12 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>		/* for int64_t & friends */
 #ifdef XFree86Server
 # include "xf86.h"

Index: xf86drmHash.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/xf86drmHash.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/xf86drmHash.c	19 Feb 2004 03:51:38 -0000	1.5
+++ b/xf86drmHash.c	28 Feb 2004 01:27:59 -0000	1.6
@@ -70,6 +70,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define HASH_MAIN 0
 
 #if HASH_MAIN

Index: xf86drmRandom.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/xf86drmRandom.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/xf86drmRandom.c	19 Feb 2004 03:51:38 -0000	1.5
+++ b/xf86drmRandom.c	28 Feb 2004 01:27:59 -0000	1.6
@@ -73,6 +73,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define RANDOM_MAIN 0
 
 #if RANDOM_MAIN

Index: xf86drmSL.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/xf86drmSL.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/xf86drmSL.c	19 Feb 2004 03:51:38 -0000	1.5
+++ b/xf86drmSL.c	28 Feb 2004 01:27:59 -0000	1.6
@@ -40,6 +40,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define SL_MAIN 0
 
 #if SL_MAIN