Commit c1c5f421 authored by Adam Jackson's avatar Adam Jackson

Prep for modular builds by adding guarded #include "config.h" everywhere.

parent c332dffd
......@@ -16,6 +16,10 @@
*
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <X11/Xarch.h>
#include "xaalocal.h"
#include "xaarop.h"
......
......@@ -9,6 +9,10 @@
* Ported to 4.0 by Tim Roberts.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "savage_driver.h"
static void SavageLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src);
......
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c,v 1.3 2001/05/18 23:35:32 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c,v 1.6 2003/01/18 15:22:29 eich Exp $ */
/*
Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
......@@ -25,6 +25,9 @@ be used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the XFree86 Project.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/*
* file: savage_dga.c
......@@ -275,7 +278,7 @@ Savage_SetMode(
psav->DGAactive = FALSE;
SavageSwitchMode(index, pScrn->currentMode, 0);
if( psav->hwcursor )
if( psav->hwcursor && psav->hwc_on )
SavageShowCursor(pScrn);
} else {
Bool holdBIOS = psav->UseBIOS;
......@@ -289,8 +292,11 @@ Savage_SetMode(
pMode->bitsPerPixel, pMode->depth);
#endif
if( psav->hwcursor )
if( psav->hwcursor && psav->hwc_on) {
SavageHideCursor(pScrn);
psav->hwc_on = TRUE; /* save for later restauration */
}
if(!psav->DGAactive) { /* save the old parameters */
OldDisplayWidth[index] = pScrn->displayWidth;
......
......@@ -22,6 +22,10 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef XF86DRI
#include "xf86.h"
......
......@@ -11,6 +11,9 @@
*
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xf86RAC.h"
#include "shadowfb.h"
......
......@@ -22,6 +22,10 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
......
......@@ -25,6 +25,9 @@ be used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the XFree86 Project.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xf86.h"
#include "xf86_OSproc.h"
......
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c,v 1.4 2001/05/18 23:35:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "savage_driver.h"
#include "xaarop.h"
#include "savage_bci.h"
......
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_shadow.c,v 1.2 2002/05/14 20:19:52 alanh Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.3 2000/03/31 20:13:33 dawes Exp $ */
/*
Copyright (c) 1999,2000 The XFree86 Project Inc.
based on code written by Mark Vojkovich <markv@valinux.com>
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "savage_driver.h"
#include "shadowfb.h"
#include "servermd.h"
......
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <X11/extensions/Xv.h>
#include "dix.h"
#include "dixstruct.h"
......
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.c,v 1.11 2002/05/14 20:19:52 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "savage_driver.h"
#include "savage_vbe.h"
......
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.17tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <X11/extensions/Xv.h>
#include "dix.h"
#include "dixstruct.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment