[xserver-commit] xfree86/drivers/vmware bits2pixels.c,1.2,1.3 offscreen_manager.c,1.2,1.3 vmware.c,1.19,1.20 vmwarecurs.c,1.11,1.12 vmwarexaa.c,1.6,1.7

[Keith Packard]

Committed by: keithp

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

Modified Files:
	bits2pixels.c offscreen_manager.c vmware.c vmwarecurs.c 
	vmwarexaa.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: bits2pixels.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/vmware/bits2pixels.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/bits2pixels.c	11 Dec 2002 17:07:58 -0000	1.2
+++ b/bits2pixels.c	28 Feb 2004 01:27:51 -0000	1.3
@@ -3,6 +3,9 @@
  * Copyright (C) 1999-2001 VMware, Inc.
  * All Rights Reserved
  * **********************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef VMX86_DEVEL
 char rcsId_bits2pixels[] = "Id: bits2pixels.c,v 1.6 2001/01/26 23:32:15 yoel Exp $";
 #else

Index: offscreen_manager.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/vmware/offscreen_manager.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/offscreen_manager.c	11 Dec 2002 17:07:58 -0000	1.2
+++ b/offscreen_manager.c	28 Feb 2004 01:27:51 -0000	1.3
@@ -4,6 +4,9 @@
  * **********************************************************/
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.c,v 1.1 2002/12/10 04:17:19 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vmware.h"
 
 struct _Heap {

Index: vmware.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/vmware/vmware.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- a/vmware.c	30 Oct 2003 17:37:16 -0000	1.19
+++ b/vmware.c	28 Feb 2004 01:27:51 -0000	1.20
@@ -2,6 +2,9 @@
  * Copyright (C) 1998-2001 VMware, Inc.
  * All Rights Reserved
  * **********************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef VMX86_DEVEL
 char rcsId_vmware[] =
     "Id: vmware.c,v 1.11 2001/02/23 02:10:39 yoel Exp $";

Index: vmwarecurs.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/vmware/vmwarecurs.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/vmwarecurs.c	5 Feb 2003 12:47:42 -0000	1.11
+++ b/vmwarecurs.c	28 Feb 2004 01:27:51 -0000	1.12
@@ -2,6 +2,9 @@
  * Copyright (C) 1998-2001 VMware, Inc.
  * All Rights Reserved
  * **********************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef VMX86_DEVEL
 char rcsId_vmwarecurs[] =
     "Id: vmwarecurs.c,v 1.5 2001/01/30 23:33:02 bennett Exp $";

Index: vmwarexaa.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/vmware/vmwarexaa.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/vmwarexaa.c	13 Apr 2003 18:09:27 -0000	1.6
+++ b/vmwarexaa.c	28 Feb 2004 01:27:51 -0000	1.7
@@ -2,6 +2,9 @@
  * Copyright (C) 1998-2001 VMware, Inc.
  * All Rights Reserved
  * **********************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef VMX86_DEVEL
 char rcsId_vmwarexaa[] =
     "Id: $";