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

5 files changed, 28 insertions, 12 deletions

diff --git a/src/i128IBMDAC.c b/src/i128IBMDAC.c
index 385bb76..13430f7 100644
--- a/src/i128IBMDAC.c
+++ b/src/i128IBMDAC.c
@@ -21,7 +21,11 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128IBMDAC.c,v 1.2 2000/10/25 22:53:33 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128IBMDAC.c,v 1.3tsi Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_ansic.h"
@@ -322,7 +326,7 @@ I128ProgramIBMRGB(ScrnInfoPtr pScrn, DisplayModePtr mode)
    I128Ptr pI128 = I128PTR(pScrn);
    unsigned char tmp2, m, n, df, best_m, best_n, best_df, max_n;
    CARD32 tmpl, tmph, tmpc;
-   long f, vrf, outf, best_vrf, best_diff, best_outf, diff;
+   long f, vrf, outf, best_diff, best_outf = 0, diff;
    long requested_freq;
    int   freq = mode->SynthClock;
    int   flags = mode->Flags;
@@ -350,7 +354,6 @@ I128ProgramIBMRGB(ScrnInfoPtr pScrn, DisplayModePtr mode)
    requested_freq = freq * 1000;
 
    best_m = best_n = best_df = 0;
-   best_vrf = best_outf = 0;
    best_diff = requested_freq;  /* worst case */
 
    for (df=0; df<4; df++) {
@@ -532,7 +535,7 @@ I128ProgramSilverHammer(ScrnInfoPtr pScrn, DisplayModePtr mode)
    I128Ptr pI128 = I128PTR(pScrn);
    unsigned char tmp2, m, n, df, best_m, best_n, best_df, max_n;
    CARD32 tmpl, tmph, tmpc;
-   long f, vrf, outf, best_vrf, best_diff, best_outf, diff;
+   long f, vrf, outf, best_diff, best_outf = 0, diff;
    long requested_freq;
    int   freq = mode->SynthClock;
    int   flags = mode->Flags;
@@ -562,7 +565,6 @@ I128ProgramSilverHammer(ScrnInfoPtr pScrn, DisplayModePtr mode)
    requested_freq = freq * 1000;
 
    best_m = best_n = best_df = 0;
-   best_vrf = best_outf = 0;
    best_diff = requested_freq;  /* worst case */
 
    for (df=0; df<4; df++) {
@@ -732,5 +734,3 @@ I128ProgramSilverHammer(ScrnInfoPtr pScrn, DisplayModePtr mode)
 
    return(TRUE);
 }
-
-
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 380a35c..a713e81 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c,v 1.34tsi Exp $ */
 
 
diff --git a/src/i128accel.c b/src/i128accel.c
index d1a3bb4..185dbfd 100644
--- a/src/i128accel.c
+++ b/src/i128accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128accel.c,v 1.8 2003/02/17 16:08:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128accel.c,v 1.7 2000/12/06 01:07:34 robin Exp $ */
 
 /*
  * Copyright 1997-2000 by Robin Cutshaw <robin@XFree86.Org>
@@ -23,6 +23,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xaa.h"
 #include "xaalocal.h"
 #include "xf86fbman.h"
diff --git a/src/i128dga.c b/src/i128dga.c
index 3fb1132..07b98a5 100644
--- a/src/i128dga.c
+++ b/src/i128dga.c
@@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128dga.c,v 1.4 2002/10/09 16:38:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128dga.c,v 1.3tsi Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/i128init.c b/src/i128init.c
index 125e66f..a1b68d2 100644
--- a/src/i128init.c
+++ b/src/i128init.c
@@ -23,6 +23,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* $XConsortium: $ */
 
 
@@ -52,7 +56,7 @@ I128SaveState(ScrnInfoPtr pScrn)
 	if (pI128->Debug) {
 		unsigned long tmp1 = inl(iR->iobase + 0x1C);
 		unsigned long tmp2 = inl(iR->iobase + 0x20);
-        	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "I128SaveState saving, config1/2 = 0x%x/0x%x\n", tmp1, tmp2);
+        	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "I128SaveState saving, config1/2 = 0x%lx/0x%lx\n", tmp1, tmp2);
 		I128DumpActiveRegisters(pScrn);
 	}
 
@@ -276,7 +280,7 @@ I128RestoreState(ScrnInfoPtr pScrn)
 		if (pI128->Debug) {
 			unsigned long tmp1 = inl(iR->iobase + 0x1C);
 			unsigned long tmp2 = inl(iR->iobase + 0x20);
-       	 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "I128RestoreState restoring, config1/2 = 0x%x/0x%x\n", tmp1, tmp2);
+       	 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "I128RestoreState restoring, config1/2 = 0x%lx/0x%lx\n", tmp1, tmp2);
 			I128DumpActiveRegisters(pScrn);
 		}
 
@@ -338,7 +342,7 @@ I128RestoreState(ScrnInfoPtr pScrn)
 	if (pI128->Debug) {
 		unsigned long tmp1 = inl(iR->iobase + 0x1C);
 		unsigned long tmp2 = inl(iR->iobase + 0x20);
-        	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "I128RestoreState resetting config1/2 from 0x%x/0x%x to 0x%x/0x%x\n", tmp1, tmp2, iR->config1, iR->config2);
+        	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "I128RestoreState resetting config1/2 from 0x%lx/0x%lx to 0x%lx/0x%lx\n", tmp1, tmp2, (unsigned long)iR->config1, (unsigned long)iR->config2);
 		I128DumpActiveRegisters(pScrn);
 	}