diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-11 02:29:46 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-11 02:29:46 +0000 |
| commit | 018083ae6549d6973856f9191517af7794ecbf6a (patch) | |
| tree | 789a77e11c5379aae5be8fef59649f294fc74608 | |
| parent | a27599b6440422affac684edc1a968aa447c787f (diff) | |
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
| -rw-r--r-- | src/cyrix_accel.c | 6 | ||||
| -rw-r--r-- | src/cyrix_bank.c | 6 | ||||
| -rw-r--r-- | src/cyrix_driver.c | 4 | ||||
| -rw-r--r-- | src/cyrix_helper.c | 7 | ||||
| -rw-r--r-- | src/cyrix_shadow.c | 6 |
5 files changed, 25 insertions, 4 deletions
diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c index 652c1d8..cda6246 100644 --- a/src/cyrix_accel.c +++ b/src/cyrix_accel.c @@ -26,7 +26,11 @@ * Dirk H. Hohndel (hohndel@suse.de), * Portions: the GGI project & confidential CYRIX databooks. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.5 2002/11/06 11:38:59 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.3 2000/04/19 16:57:43 eich Exp $ */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "vgaHW.h" #include "xf86.h" diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c index e06d6dd..38c1eca 100644 --- a/src/cyrix_bank.c +++ b/src/cyrix_bank.c @@ -26,7 +26,11 @@ * Dirk H. Hohndel (hohndel@suse.de), * Portions: the GGI project & confidential CYRIX databooks. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.3 2002/11/06 11:38:59 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.1 2000/02/13 00:56:10 dawes Exp $ */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #define PSZ 8 diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c index 21901d3..9dfa4e4 100644 --- a/src/cyrix_driver.c +++ b/src/cyrix_driver.c @@ -52,6 +52,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.30tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "fb.h" #include "mibank.h" #include "micmap.h" diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c index 22c46a2..bbb8641 100644 --- a/src/cyrix_helper.c +++ b/src/cyrix_helper.c @@ -41,10 +41,15 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.4 2002/11/06 11:38:59 alanh Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "cyrix.h" #include "vgaHW.h" #include "xf86_ansic.h" #include "compiler.h" +#include "xf86.h" #define CYRIXmarkLinesDirty { \ int k = 0; \ @@ -58,7 +63,7 @@ static void CYRIXresetVGA(ScrnInfoPtr pScrn, unsigned long vgaIOBase); void Cyrix1bppColorMap(ScrnInfoPtr pScrn) { /* use dedicated color map routines on new chipsets in 8bpp */ - ErrorF("%s: Cyrix 1BPP is only a stub for now.\n", X_PROBED); + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Cyrix 1BPP is only a stub for now.\n"); return; } diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c index 479ad36..4c06858 100644 --- a/src/cyrix_shadow.c +++ b/src/cyrix_shadow.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_shadow.c,v 1.1 2002/11/06 11:38:59 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_shadow.c,v 1.1 1999/08/14 10:49:48 dawes Exp $ */ /* Copyright (c) 1999, The XFree86 Project Inc. 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" |