Prep for modular builds by adding guarded #include "config.h" everywhere.XORG-6_8_99_900XORG-6_8_99_16XORG-6_8_99_15

12 files changed, 52 insertions, 4 deletions

diff --git a/src/savage_accel.c b/src/savage_accel.c
index 5593f49..a231bba 100644
--- a/src/savage_accel.c
+++ b/src/savage_accel.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xarch.h>
 #include "xaalocal.h"
 #include "xaarop.h"
diff --git a/src/savage_cursor.c b/src/savage_cursor.c
index be1a6c0..9d34bda 100644
--- a/src/savage_cursor.c
+++ b/src/savage_cursor.c
@@ -9,6 +9,10 @@
  * Ported to 4.0 by Tim Roberts.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "savage_driver.h"
 
 static void SavageLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src);
diff --git a/src/savage_dga.c b/src/savage_dga.c
index 50a36b0..49c9a3c 100644
--- a/src/savage_dga.c
+++ b/src/savage_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c,v 1.3 2001/05/18 23:35:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c,v 1.6 2003/01/18 15:22:29 eich Exp $ */
 
 /*
 Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
@@ -25,6 +25,9 @@ be used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from the XFree86 Project.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /*
  * file: savage_dga.c
@@ -275,7 +278,7 @@ Savage_SetMode(
 
 	psav->DGAactive = FALSE;
 	SavageSwitchMode(index, pScrn->currentMode, 0);
-	if( psav->hwcursor )
+	if( psav->hwcursor && psav->hwc_on )
 	    SavageShowCursor(pScrn);
     } else {
 	Bool holdBIOS = psav->UseBIOS;
@@ -289,8 +292,11 @@ Savage_SetMode(
 	    pMode->bitsPerPixel, pMode->depth);
 #endif
 
-	if( psav->hwcursor )
+	if( psav->hwcursor && psav->hwc_on) {
 	    SavageHideCursor(pScrn);
+	    psav->hwc_on = TRUE;    /* save for later restauration */
+	}
+	
 
 	if(!psav->DGAactive) {  /* save the old parameters */
 	    OldDisplayWidth[index] = pScrn->displayWidth;
diff --git a/src/savage_dri.c b/src/savage_dri.c
index dc07602..1220bba 100644
--- a/src/savage_dri.c
+++ b/src/savage_dri.c
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef XF86DRI
 
 #include "xf86.h"
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 773e499..d317425 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -11,6 +11,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86RAC.h"
 #include "shadowfb.h"
diff --git a/src/savage_hwmc.c b/src/savage_hwmc.c
index b0c2bd8..6e42779 100644
--- a/src/savage_hwmc.c
+++ b/src/savage_hwmc.c
@@ -22,6 +22,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
diff --git a/src/savage_i2c.c b/src/savage_i2c.c
index 895a74e..6aeea9e 100644
--- a/src/savage_i2c.c
+++ b/src/savage_i2c.c
@@ -25,6 +25,9 @@ be used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from the XFree86 Project.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/savage_image.c b/src/savage_image.c
index 9530bff..62e5c52 100644
--- a/src/savage_image.c
+++ b/src/savage_image.c
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c,v 1.4 2001/05/18 23:35:32 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "savage_driver.h"
 #include "xaarop.h"
 #include "savage_bci.h"
diff --git a/src/savage_shadow.c b/src/savage_shadow.c
index 00a5120..77d687d 100644
--- a/src/savage_shadow.c
+++ b/src/savage_shadow.c
@@ -1,10 +1,14 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_shadow.c,v 1.2 2002/05/14 20:19:52 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.3 2000/03/31 20:13:33 dawes Exp $ */
 
 /*
    Copyright (c) 1999,2000  The XFree86 Project Inc. 
    based on code written by Mark Vojkovich <markv@valinux.com>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "savage_driver.h"
 #include "shadowfb.h"
 #include "servermd.h"
diff --git a/src/savage_streams.c b/src/savage_streams.c
index ef4d815..e580001 100644
--- a/src/savage_streams.c
+++ b/src/savage_streams.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/extensions/Xv.h>
 #include "dix.h"
 #include "dixstruct.h"
diff --git a/src/savage_vbe.c b/src/savage_vbe.c
index 11ad54d..f10eae9 100644
--- a/src/savage_vbe.c
+++ b/src/savage_vbe.c
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.c,v 1.11 2002/05/14 20:19:52 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "savage_driver.h"
 #include "savage_vbe.h"
 
diff --git a/src/savage_video.c b/src/savage_video.c
index d62d3c4..bea3d89 100644
--- a/src/savage_video.c
+++ b/src/savage_video.c
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.17tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/extensions/Xv.h>
 #include "dix.h"
 #include "dixstruct.h"