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

9 files changed, 44 insertions, 17 deletions

diff --git a/src/s3_IBMRGB.c b/src/s3_IBMRGB.c
index 88045e2..94012f4 100644
--- a/src/s3_IBMRGB.c
+++ b/src/s3_IBMRGB.c
@@ -24,8 +24,11 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_IBMRGB.c,v 1.6 2003/07/17 08:19:36 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_IBMRGB.c,v 1.4 2002/12/11 17:30:48 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/s3_Ti.c b/src/s3_Ti.c
index f02a6b1..769be7e 100644
--- a/src/s3_Ti.c
+++ b/src/s3_Ti.c
@@ -24,7 +24,11 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_Ti.c,v 1.6 2003/07/17 08:19:36 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_Ti.c,v 1.4 2001/10/28 03:33:44 tsi Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/s3_Trio64DAC.c b/src/s3_Trio64DAC.c
index 4142c1e..83e4647 100644
--- a/src/s3_Trio64DAC.c
+++ b/src/s3_Trio64DAC.c
@@ -24,7 +24,11 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_Trio64DAC.c,v 1.6 2003/07/04 16:24:28 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_Trio64DAC.c,v 1.7tsi Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -180,7 +184,7 @@ S3TrioCalcClock(long freq, int min_m, int min_n1, int max_n1, int min_n2,
 		ffreq = ffreq_min / (1<<max_n2);
 	}
 	if (ffreq > ffreq_max / (1<<min_n2)) {
-		ErrorF("invalid frequency %1.3F Mhz [freq <= %1.3f Mhz]\n",
+		ErrorF("invalid frequency %1.3f Mhz [freq <= %1.3f Mhz]\n",
 			ffreq*BASE_FREQ, ffreq_max*BASE_FREQ/(1<<min_n2));
 		ffreq = ffreq_max / (1<<min_n2);
 	}
@@ -220,7 +224,6 @@ static void S3TrioSetPLL(ScrnInfoPtr pScrn, int clk, unsigned char m,
 		  unsigned char n)
 {
 	unsigned char tmp;
-	int index2;
 
 	if (clk < 2) {
 		tmp = inb(0x3cc);
@@ -244,7 +247,6 @@ static void S3TrioSetPLL(ScrnInfoPtr pScrn, int clk, unsigned char m,
 			outb(0x3c5, tmp | 0x22);
 			outb(0x3c5, tmp | 0x02);
 		} else {
-			index2 = 0x10;
 			outb(0x3c4, 0x10);
 			outb(0x3c5, n);
 			outb(0x3c4, 0x11);
@@ -282,7 +284,7 @@ static void S3TrioSetClock(ScrnInfoPtr pScrn, long freq, int clk, int min_m,
 void S3Trio64DAC_PreInit(ScrnInfoPtr pScrn)
 {
 	S3Ptr pS3 = S3PTR(pScrn);
-	unsigned char SR8, SR27, SR28;
+	unsigned char SR8, SR27;
 	int m, n, n1, n2, mclk;
 
 	outb(0x3c4, 0x08);
@@ -302,7 +304,7 @@ void S3Trio64DAC_PreInit(ScrnInfoPtr pScrn)
 		outb(0x3c4, 0x27);
 		SR27 = inb(0x3c5);
 		outb(0x3c4, 0x28);
-		SR28 = inb(0x3c5);
+		(void) inb(0x3c5);
 		mclk /= ((SR27 >> 2) & 0x03) + 1;
 	}
 	pS3->mclk = mclk;
diff --git a/src/s3_accel.c b/src/s3_accel.c
index cd77330..af94816 100644
--- a/src/s3_accel.c
+++ b/src/s3_accel.c
@@ -27,6 +27,9 @@
 /* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2004/04/23 19:43:14 eich Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2001/10/28 03:33:44 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 
diff --git a/src/s3_bios.c b/src/s3_bios.c
index b194a11..781918f 100644
--- a/src/s3_bios.c
+++ b/src/s3_bios.c
@@ -24,7 +24,11 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_bios.c,v 1.3 2002/01/25 21:56:08 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_bios.c,v 1.2 2001/07/11 07:45:35 alanh Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/s3_cursor.c b/src/s3_cursor.c
index 7a098a1..e6eac18 100644
--- a/src/s3_cursor.c
+++ b/src/s3_cursor.c
@@ -24,7 +24,11 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_cursor.c,v 1.2 2003/07/17 08:19:36 eich Exp $ */
+/* $XFree86: $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/s3_dga.c b/src/s3_dga.c
index a8e6560..f1c97d6 100644
--- a/src/s3_dga.c
+++ b/src/s3_dga.c
@@ -24,7 +24,11 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_dga.c,v 1.1 2001/07/02 10:46:04 alanh Exp $ */
+/* $XFree86: $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/s3_driver.c b/src/s3_driver.c
index 1049aa7..dff0433 100644
--- a/src/s3_driver.c
+++ b/src/s3_driver.c
@@ -36,6 +36,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c,v 1.19tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/s3_video.c b/src/s3_video.c
index 4736d59..3ca06ae 100644
--- a/src/s3_video.c
+++ b/src/s3_video.c
@@ -24,7 +24,11 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_video.c,v 1.3 2003/04/23 21:51:42 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_video.c,v 1.4tsi Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -242,7 +246,7 @@ static XF86VideoAdaptorPtr S3SetupImageVideoOverlay(ScreenPtr pScreen)
     	adapt->QueryImageAttributes = S3QueryImageAttributes;
  
     	/* gotta uninit this someplace */
-    	REGION_INIT(pScreen, &(pS3->portPrivate->clip), NullBox, 0);
+	REGION_NULL(pScreen, &(pS3->portPrivate->clip));
        
     	S3ResetVideoOverlay(pScrn);
        
@@ -367,8 +371,6 @@ static int S3PutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
    	int top, left, npixels, nlines;
    	BoxRec dstBox;
    	CARD32 tmp;
-   	static int once = 1;
-   	static int once2 = 1;
 
    /* Clip */
    x1 = src_x;
@@ -438,7 +440,6 @@ static int S3PutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
         xf86XVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1),
                                 buf + offset2, buf + offset3, dst_start,
                                 srcPitch, srcPitch2, dstPitch, nlines, npixels);
-        once2 = 0;
         break; 
     case FOURCC_UYVY:
     case FOURCC_YUY2:
@@ -446,7 +447,6 @@ static int S3PutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
         buf += (top * srcPitch) + left;
         nlines = ((y2 + 0xffff) >> 16) - top;
         xf86XVCopyPacked(buf, dst_start, srcPitch, dstPitch, nlines, npixels);
-        once = 0;
         break;
     }