[xserver-commit] xfree86/os-support/bsd alpha_video.c,1.6,1.7 arm_video.c,1.2,1.3 bsdResource.c,1.9,1.10 bsd_KbdMap.c,1.1,1.2 bsd_VTsw.c,3.6,3.7 bsd_apm.c,1.1,1.2 bsd_axp.c,1.3,1.4 bsd_ev56.c,1.2,1.3 bsd_init.c,3.22,3.23 bsd_io.c,3.23,3.24 bsd_jstk.c,3.8,3.9 bsd_kbd.c,1.9,1.10 bsd_kmod.c,3.2,3.3 bsd_kqueue_apm.c,1.5,1.6 bsd_mouse.c,1.27,1.28 i386_video.c,1.5,1.6 ppc_video.c,1.6,1.7 sparc64_video.c,1.3,1.4

Keith Packard xserver-commit@pdx.freedesktop.org 

Committed by: keithp

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

Modified Files:
	alpha_video.c arm_video.c bsdResource.c bsd_KbdMap.c 
	bsd_VTsw.c bsd_apm.c bsd_axp.c bsd_ev56.c bsd_init.c bsd_io.c 
	bsd_jstk.c bsd_kbd.c bsd_kmod.c bsd_kqueue_apm.c bsd_mouse.c 
	i386_video.c ppc_video.c sparc64_video.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: alpha_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/alpha_video.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/alpha_video.c	30 Dec 2003 15:18:30 -0000	1.6
+++ b/alpha_video.c	28 Feb 2004 01:27:55 -0000	1.7
@@ -26,6 +26,9 @@
 
 /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: arm_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/arm_video.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/arm_video.c	14 Mar 2003 13:46:03 -0000	1.2
+++ b/arm_video.c	28 Feb 2004 01:27:55 -0000	1.3
@@ -59,6 +59,9 @@
 
 /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: bsdResource.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsdResource.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/bsdResource.c	2 Oct 2003 13:30:06 -0000	1.9
+++ b/bsdResource.c	28 Feb 2004 01:27:55 -0000	1.10
@@ -2,6 +2,9 @@
 
 /* Resource information code */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: bsd_KbdMap.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_KbdMap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/bsd_KbdMap.c	11 Oct 2002 01:40:34 -0000	1.1
+++ b/bsd_KbdMap.c	28 Feb 2004 01:27:55 -0000	1.2
@@ -8,6 +8,9 @@
  * and from xf86KbdCODrv.c by Holger Veit
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "Xmd.h"
 #include "input.h"

Index: bsd_VTsw.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_VTsw.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- a/bsd_VTsw.c	25 Jul 1998 16:56:33 -0000	3.6
+++ b/bsd_VTsw.c	28 Feb 2004 01:27:55 -0000	3.7
@@ -25,6 +25,9 @@
  */
 /* $XConsortium: bsd_VTsw.c /main/4 1996/02/21 17:50:57 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: bsd_apm.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_apm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/bsd_apm.c	29 Feb 2000 03:09:25 -0000	1.1
+++ b/bsd_apm.c	28 Feb 2004 01:27:55 -0000	1.2
@@ -1,5 +1,8 @@
 /* $XFree86$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "os.h"
 #include "xf86.h"

Index: bsd_axp.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_axp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/bsd_axp.c	7 Oct 2003 22:33:37 -0000	1.3
+++ b/bsd_axp.c	28 Feb 2004 01:27:55 -0000	1.4
@@ -1,5 +1,8 @@
 /* $XFree86: bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "os.h"
 #include "xf86.h"

Index: bsd_ev56.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_ev56.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/bsd_ev56.c	27 Feb 2001 23:05:00 -0000	1.2
+++ b/bsd_ev56.c	28 Feb 2004 01:27:55 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.1 2000/03/05 16:59:17 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "input.h"
 #include "scrnintstr.h"

Index: bsd_init.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_init.c,v
retrieving revision 3.22
retrieving revision 3.23
diff -u -d -r3.22 -r3.23
--- a/bsd_init.c	7 Oct 2003 23:14:55 -0000	3.22
+++ b/bsd_init.c	28 Feb 2004 01:27:55 -0000	3.23
@@ -25,6 +25,9 @@
  */
 /* $XConsortium: bsd_init.c /main/8 1996/10/23 13:13:05 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 
 #include "compiler.h"

Index: bsd_io.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_io.c,v
retrieving revision 3.23
retrieving revision 3.24
diff -u -d -r3.23 -r3.24
--- a/bsd_io.c	21 Oct 2002 20:38:04 -0000	3.23
+++ b/bsd_io.c	28 Feb 2004 01:27:55 -0000	3.24
@@ -25,6 +25,9 @@
  */
 /* $XConsortium: bsd_io.c /main/11 1996/10/19 18:06:07 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include "X.h"
 

Index: bsd_jstk.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_jstk.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- a/bsd_jstk.c	6 Aug 2002 13:20:47 -0000	3.8
+++ b/bsd_jstk.c	28 Feb 2004 01:27:55 -0000	3.9
@@ -25,6 +25,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.7 1998/07/25 16:56:34 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <unistd.h>
 #include <string.h>

Index: bsd_kbd.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_kbd.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/bsd_kbd.c	7 Jan 2004 17:05:28 -0000	1.9
+++ b/bsd_kbd.c	28 Feb 2004 01:27:55 -0000	1.10
@@ -9,6 +9,9 @@
  * Copyright 1993 by David Dawes <dawes@xfree86.org>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include "X.h"
 

Index: bsd_kmod.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_kmod.c,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -d -r3.2 -r3.3
--- a/bsd_kmod.c	29 Nov 2002 17:47:24 -0000	3.2
+++ b/bsd_kmod.c	28 Feb 2004 01:27:55 -0000	3.3
@@ -1,5 +1,8 @@
 /* $XFree86$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>

Index: bsd_kqueue_apm.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_kqueue_apm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/bsd_kqueue_apm.c	30 Jul 2002 23:24:32 -0000	1.5
+++ b/bsd_kqueue_apm.c	28 Feb 2004 01:27:55 -0000	1.6
@@ -28,6 +28,9 @@
  */
 /* $OpenBSD: bsd_kqueue_apm.c,v 1.5 2002/07/30 23:07:42 matthieu Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "os.h"
 #include "xf86.h"

Index: bsd_mouse.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/bsd_mouse.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- a/bsd_mouse.c	17 Jan 2004 15:20:05 -0000	1.27
+++ b/bsd_mouse.c	28 Feb 2004 01:27:55 -0000	1.28
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: i386_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/i386_video.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/i386_video.c	7 Oct 2003 23:14:55 -0000	1.5
+++ b/i386_video.c	28 Feb 2004 01:27:55 -0000	1.6
@@ -26,6 +26,9 @@
 
 /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: ppc_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/ppc_video.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/ppc_video.c	7 Oct 2003 23:14:55 -0000	1.6
+++ b/ppc_video.c	28 Feb 2004 01:27:55 -0000	1.7
@@ -26,6 +26,9 @@
 
 /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: sparc64_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bsd/sparc64_video.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/sparc64_video.c	7 Oct 2003 23:14:55 -0000	1.3
+++ b/sparc64_video.c	28 Feb 2004 01:27:55 -0000	1.4
@@ -27,6 +27,9 @@
 
 /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "xf86.h"
 #include "xf86Priv.h"