diff options
| -rw-r--r-- | src/apm.h | 6 | ||||
| -rw-r--r-- | src/apm_cursor.c | 15 | ||||
| -rw-r--r-- | src/apm_driver.c | 2 | ||||
| -rw-r--r-- | src/apm_rush.c | 8 |
4 files changed, 10 insertions, 21 deletions
@@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.19 2002/05/07 12:53:49 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.19tsi Exp $ */ /* All drivers should typically include these */ @@ -54,7 +54,7 @@ #include "xf86DDC.h" #include "xf86xv.h" -#include "Xv.h" +#include <X11/extensions/Xv.h> #ifdef TRUE #undef TRUE @@ -146,7 +146,7 @@ typedef struct { struct ApmStippleCacheRec { XAACacheInfoRec apmStippleCache; FBAreaPtr area; - int apmStippleCached:1; + unsigned int apmStippleCached:1; } apmCache[APM_CACHE_NUMBER]; int apmCachePtr; unsigned char regcurr[0x54]; diff --git a/src/apm_cursor.c b/src/apm_cursor.c index 4bf0f98..1ad0e82 100644 --- a/src/apm_cursor.c +++ b/src/apm_cursor.c @@ -1,8 +1,8 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.14 2000/06/30 18:27:02 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "input.h" #include "cursorstr.h" @@ -84,17 +84,6 @@ int ApmHWCursorInit(ScreenPtr pScreen) infoPtr->ShowCursor = ApmShowCursor; infoPtr->UseHWCursor = ApmUseHWCursor; - /*ErrorF("%s %s: %s: Using hardware cursor (XAA).\n", - XCONFIG_PROBED, vga256InfoRec.name, vga256InfoRec.chipset); - - if(XAACursorInfoRec.Flags & USE_HARDWARE_CURSOR) { - vgaHWCursor.Init = XAACursorInit; - vgaHWCursor.Initialized = TRUE; - vgaHWCursor.Restore = XAARestoreCursor; - vgaHWCursor.Warp = XAAWarpCursor; - vgaHWCursor.QueryBestSize = XAAQueryBestSize; - }*/ - /* Set up the convert table for the input cursor data */ for (i = 0; i < 256; i++) ConvertTable[i] = ((~i) & 0xAA) | (i & (i >> 1) & 0x55); diff --git a/src/apm_driver.c b/src/apm_driver.c index b13f184..6d87a92 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -10,7 +10,7 @@ #include "opaque.h" #define DPMS_SERVER -#include "extensions/dpms.h" +#include <X11/extensions/dpms.h> #define VERSION 4000 #define APM_NAME "APM" diff --git a/src/apm_rush.c b/src/apm_rush.c index 28cfe50..8264c60 100644 --- a/src/apm_rush.c +++ b/src/apm_rush.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.2 2004/04/23 19:25:03 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.3 2004/12/04 00:42:59 kuhn Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.11tsi Exp $ */ /* * Copyright Loïc Grenié 1999 @@ -309,14 +309,14 @@ Copyright (c) 1998 Daryll Strauss #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" #include "scrnintstr.h" #define _XF86RUSH_SERVER_ -#include "xf86rushstr.h" +#include <X11/extensions/xf86rushstr.h> static unsigned char RushReqCode = 0; static int RushErrorBase; |