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

17 files changed, 82 insertions, 18 deletions

diff --git a/src/clientlx.c b/src/clientlx.c
index 65b899c..c4f312b 100644
--- a/src/clientlx.c
+++ b/src/clientlx.c
@@ -7,6 +7,10 @@
     All Rights Reserved.
 
 \******************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
 #include "xf86_ansic.h"
diff --git a/src/mga_arc.c b/src/mga_arc.c
index 61ab077..895b439 100644
--- a/src/mga_arc.c
+++ b/src/mga_arc.c
@@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group.
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c,v 1.12tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <X11/X.h>
 #include "gcstruct.h"
diff --git a/src/mga_bios.c b/src/mga_bios.c
index c2aacbc..05e5a4f 100644
--- a/src/mga_bios.c
+++ b/src/mga_bios.c
@@ -34,6 +34,10 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/mga_dac3026.c b/src/mga_dac3026.c
index 3efdf3c..d06f486 100644
--- a/src/mga_dac3026.c
+++ b/src/mga_dac3026.c
@@ -30,6 +30,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /*
  * This is a first cut at a non-accelerated version to work with the
diff --git a/src/mga_dacG.c b/src/mga_dacG.c
index 4ec5d5b..3385636 100644
--- a/src/mga_dacG.c
+++ b/src/mga_dacG.c
@@ -9,6 +9,10 @@
  * new server design (DHD).
  */                     
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "colormapst.h"
 
 /* All drivers should typically include these */
diff --git a/src/mga_dga.c b/src/mga_dga.c
index a08619f..28ff766 100644
--- a/src/mga_dga.c
+++ b/src/mga_dga.c
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dga.c,v 1.14 1999/11/02 23:12:00 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
diff --git a/src/mga_dh.c b/src/mga_dh.c
index 63ddf80..e5c0114 100644
--- a/src/mga_dh.c
+++ b/src/mga_dh.c
@@ -5,6 +5,9 @@
 *       Author : Luugi Marsan
 **********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* All drivers should typically include these */
 #include "xf86.h"
diff --git a/src/mga_dri.c b/src/mga_dri.c
index 67ca068..25b8a8c 100644
--- a/src/mga_dri.c
+++ b/src/mga_dri.c
@@ -28,6 +28,10 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
diff --git a/src/mga_driver.c b/src/mga_driver.c
index 65a7721..711bb21 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -47,6 +47,9 @@
  
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c,v 1.244tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* All drivers should typically include these */
 #include "xf86.h"
diff --git a/src/mga_esc.c b/src/mga_esc.c
index dc0b7b3..3a72851 100644
--- a/src/mga_esc.c
+++ b/src/mga_esc.c
@@ -1,3 +1,4 @@
+/* $XFree86$ */
 /****************************************************************************
 * mga_esc.c
 *
@@ -6,6 +7,10 @@
 * (C) Matrox Graphics, Inc.
 *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef USEMGAHAL
 
 /* All drivers should typically include these */
@@ -216,23 +221,23 @@ static void  EscRead(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, Dis
         break;
     case 1:
         ucIndex = INREG8(0x3c00);
-        OUTREG(0x3c00, (UCHAR)ulAddr);
+        OUTREG8(0x3c00, (UCHAR)ulAddr);
         ulData = (ULONG)INREG8(0x3c0a);
-        OUTREG(0x3c00, ucIndex);
+        OUTREG8(0x3c00, ucIndex);
         sprintf(sResult, "DAC[%02X] = 0x%02X", ulAddr, ulData);
         break;
     case 2:
         ucIndex = INREG8(0x1fd4);
-        OUTREG(0x1fd4, (UCHAR)ulAddr);
+        OUTREG8(0x1fd4, (UCHAR)ulAddr);
         ulData = (ULONG)INREG8(0x1fd5);
-        OUTREG(0x1fd4, ucIndex);
+        OUTREG8(0x1fd4, ucIndex);
         sprintf(sResult, "CRTC[%02X] = 0x%02X", ulAddr, ulData);
         break;
     case 3:
         ucIndex = INREG8(0x1fde);
-        OUTREG(0x1fde, (UCHAR)ulAddr);
+        OUTREG8(0x1fde, (UCHAR)ulAddr);
         ulData = (ULONG)INREG8(0x1fdf);
-        OUTREG(0x1fde, ucIndex);
+        OUTREG8(0x1fde, ucIndex);
         sprintf(sResult, "CRTCEXT[%02X] = 0x%02X", ulAddr, ulData);
         break;
     default:
@@ -266,23 +271,23 @@ static void  EscWrite(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, Di
         break;
     case 1:
         ucIndex = INREG8(0x3c00);
-        OUTREG(0x3c00, (UCHAR)ulAddr);
-        OUTREG(0x3c0a, (UCHAR)ulData);
-        OUTREG(0x3c00, ucIndex);
+        OUTREG8(0x3c00, (UCHAR)ulAddr);
+        OUTREG8(0x3c0a, (UCHAR)ulData);
+        OUTREG8(0x3c00, ucIndex);
         strcpy(sResult, "OK");
         break;
     case 2:
         ucIndex = INREG8(0x1fd4);
-        OUTREG(0x1fd4, (UCHAR)ulAddr);
-        OUTREG(0x1fd5, (UCHAR)ulData);
-        OUTREG(0x1fd4, ucIndex);
+        OUTREG8(0x1fd4, (UCHAR)ulAddr);
+        OUTREG8(0x1fd5, (UCHAR)ulData);
+        OUTREG8(0x1fd4, ucIndex);
         strcpy(sResult, "OK");
         break;
     case 3:
         ucIndex = INREG8(0x1fde);
-        OUTREG(0x1fde, (UCHAR)ulAddr);
-        OUTREG(0x1fdf, (UCHAR)ulData);
-        OUTREG(0x1fde, ucIndex);
+        OUTREG8(0x1fde, (UCHAR)ulAddr);
+        OUTREG8(0x1fdf, (UCHAR)ulData);
+        OUTREG8(0x1fde, ucIndex);
         strcpy(sResult, "OK");
         break;
     default:
@@ -752,13 +757,13 @@ void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayM
 
     if (pMga->SecondCrtc)
     {
-     	ulScreen = 1;
+	ulScreen = 1;
     }
     else
     {
 	ulScreen = 0;
     }
-	
+
 
     if (FunctionTable[0].function &&  GetEscCommand(cmdline,  &EscCmd) )
     {
@@ -773,7 +778,7 @@ void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayM
         {
 	    EscCmd.parameters[0] &= 0xffff;
 	    EscCmd.parameters[0] |= ulScreen << 16;
-            
+
             FunctionTable[i].funcptr(pScrn, EscCmd.parameters, sResult, pMode);
         }
         else
diff --git a/src/mga_g450pll.c b/src/mga_g450pll.c
index e4d8467..da5bc9d 100644
--- a/src/mga_g450pll.c
+++ b/src/mga_g450pll.c
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_g450pll.c,v 1.8tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/mga_halmod.c b/src/mga_halmod.c
index d749fde..94e1f18 100644
--- a/src/mga_halmod.c
+++ b/src/mga_halmod.c
@@ -1,4 +1,8 @@
 /* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86Module.h"
 
 #ifdef XFree86LOADER
diff --git a/src/mga_hwcurs.c b/src/mga_hwcurs.c
index 35d98b8..a3f106f 100644
--- a/src/mga_hwcurs.c
+++ b/src/mga_hwcurs.c
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_hwcurs.c,v 1.8tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
diff --git a/src/mga_merge.c b/src/mga_merge.c
index a1378e9..d25b5cd 100644
--- a/src/mga_merge.c
+++ b/src/mga_merge.c
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c,v 1.4 2003/09/24 02:43:24 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/mga_shadow.c b/src/mga_shadow.c
index 1f9f872..cd63b07 100644
--- a/src/mga_shadow.c
+++ b/src/mga_shadow.c
@@ -5,6 +5,10 @@
    Written by Mark Vojkovich <markv@valinux.com>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
diff --git a/src/mga_storm.c b/src/mga_storm.c
index 735011e..e094669 100644
--- a/src/mga_storm.c
+++ b/src/mga_storm.c
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v 1.99tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* All drivers should typically include these */
 #include "xf86.h"
diff --git a/src/mga_video.c b/src/mga_video.c
index 3ffdfe7..bba12a7 100644
--- a/src/mga_video.c
+++ b/src/mga_video.c
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c,v 1.33tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"