From 74772a7dc49e34229497441fbbf2631bfb259b39 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 11 Jul 2005 02:29:58 +0000 Subject: Prep for modular builds by adding guarded #include "config.h" everywhere. --- src/nv_cursor.c | 4 ++++ src/nv_dac.c | 4 ++++ src/nv_dga.c | 6 +++++- src/nv_driver.c | 4 ++++ src/nv_hw.c | 4 ++++ src/nv_setup.c | 4 ++++ src/nv_shadow.c | 6 +++++- src/nv_video.c | 4 ++++ src/nv_xaa.c | 4 ++++ src/riva_cursor.c | 4 ++++ src/riva_dac.c | 4 ++++ src/riva_dga.c | 4 ++++ src/riva_driver.c | 4 ++++ src/riva_hw.c | 9 ++++++--- src/riva_setup.c | 4 ++++ src/riva_shadow.c | 4 ++++ src/riva_xaa.c | 4 ++++ 17 files changed, 72 insertions(+), 5 deletions(-) diff --git a/src/nv_cursor.c b/src/nv_cursor.c index f22e3d7..453ca52 100644 --- a/src/nv_cursor.c +++ b/src/nv_cursor.c @@ -39,6 +39,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_cursor.c,v 1.13 2004/03/13 22:07:05 mvojkovi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "nv_include.h" #include "cursorstr.h" diff --git a/src/nv_dac.c b/src/nv_dac.c index 463fde5..3fb687f 100644 --- a/src/nv_dac.c +++ b/src/nv_dac.c @@ -39,6 +39,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c,v 1.45 2005/07/09 00:53:00 mvojkovi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "nv_include.h" static int diff --git a/src/nv_dga.c b/src/nv_dga.c index d4bf3ff..ea78db9 100644 --- a/src/nv_dga.c +++ b/src/nv_dga.c @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dga.c,v 1.12 2003/07/31 20:24:29 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dga.c,v 1.11 2002/01/25 21:56:06 tsi Exp $ */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "nv_local.h" #include "nv_include.h" diff --git a/src/nv_driver.c b/src/nv_driver.c index 22beb74..84d0f5c 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -22,6 +22,10 @@ * SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen */ diff --git a/src/nv_hw.c b/src/nv_hw.c index f4d5db4..e8d8f1e 100644 --- a/src/nv_hw.c +++ b/src/nv_hw.c @@ -38,6 +38,10 @@ \***************************************************************************/ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c,v 1.15 2005/02/03 23:16:50 mvojkovi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "nv_local.h" #include "compiler.h" #include "nv_include.h" diff --git a/src/nv_setup.c b/src/nv_setup.c index 94524af..29a1e0c 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -39,6 +39,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.46 2005/07/09 00:53:00 mvojkovi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "nv_include.h" /* diff --git a/src/nv_shadow.c b/src/nv_shadow.c index 5effc79..2278bb7 100644 --- a/src/nv_shadow.c +++ b/src/nv_shadow.c @@ -2,7 +2,11 @@ Copyright (c) 1999, The XFree86 Project Inc. Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c,v 1.6 2001/01/22 21:32:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c,v 1.5 2000/03/13 18:49:29 mvojkovi Exp $ */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "nv_local.h" #include "nv_include.h" diff --git a/src/nv_video.c b/src/nv_video.c index 04b8489..85d48d6 100644 --- a/src/nv_video.c +++ b/src/nv_video.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c,v 1.23 2004/03/20 22:07:06 mvojkovi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" diff --git a/src/nv_xaa.c b/src/nv_xaa.c index 0723788..2504882 100644 --- a/src/nv_xaa.c +++ b/src/nv_xaa.c @@ -39,6 +39,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c,v 1.35 2004/03/20 16:25:18 mvojkovi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "nv_include.h" #include "xaalocal.h" #include "miline.h" diff --git a/src/riva_cursor.c b/src/riva_cursor.c index 835a4d7..9c9c267 100644 --- a/src/riva_cursor.c +++ b/src/riva_cursor.c @@ -25,6 +25,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_cursor.c $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "riva_include.h" #include "cursorstr.h" diff --git a/src/riva_dac.c b/src/riva_dac.c index 7118ae1..d371a05 100644 --- a/src/riva_dac.c +++ b/src/riva_dac.c @@ -25,6 +25,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_dac.c,v 1.1 2003/07/31 20:24:29 mvojkovi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "riva_include.h" Bool diff --git a/src/riva_dga.c b/src/riva_dga.c index 6e5afd8..5338554 100644 --- a/src/riva_dga.c +++ b/src/riva_dga.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/riva/riva_dga.c $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "riva_local.h" #include "riva_include.h" #include "riva_type.h" diff --git a/src/riva_driver.c b/src/riva_driver.c index b551e31..968ef47 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -25,6 +25,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_driver.c,v 1.5 2003/11/03 05:11:26 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "riva_include.h" #include "xf86int10.h" diff --git a/src/riva_hw.c b/src/riva_hw.c index 9f50450..1b89264 100644 --- a/src/riva_hw.c +++ b/src/riva_hw.c @@ -36,7 +36,11 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c,v 1.51 2003/07/31 20:24:30 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c,v 1.51tsi Exp $ */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "riva_local.h" #include "compiler.h" @@ -169,14 +173,13 @@ static int nv3_iterate(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_arb_i int mburst_size = 32; int mmisses, gmisses, vmisses; int misses; - int vlwm, glwm, mlwm; + int vlwm, glwm; int last, next, cur; int max_gfsize ; long ns; vlwm = 0; glwm = 0; - mlwm = 0; vfsize = 0; gfsize = 0; cur = ainfo->cur; diff --git a/src/riva_setup.c b/src/riva_setup.c index 7e8b874..faedf9a 100644 --- a/src/riva_setup.c +++ b/src/riva_setup.c @@ -25,6 +25,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_setup.c $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "riva_include.h" /* diff --git a/src/riva_shadow.c b/src/riva_shadow.c index a858f7c..eac3592 100644 --- a/src/riva_shadow.c +++ b/src/riva_shadow.c @@ -4,6 +4,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_shadow.c $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "riva_local.h" #include "riva_include.h" #include "riva_type.h" diff --git a/src/riva_xaa.c b/src/riva_xaa.c index 2d3fdc6..6863143 100644 --- a/src/riva_xaa.c +++ b/src/riva_xaa.c @@ -42,6 +42,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_xaa.c $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "riva_include.h" #include "xaalocal.h" #include "xaarop.h" -- cgit v1.2.3