From b18033249e7be4214052a2d06d60a498ba4bc359 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Wed, 12 Mar 2008 17:16:28 -0300 Subject: [PATCH] Don't call non existent functions. These were already not required to be called when available, but now they must be explicitly not called. --- src/apm.h | 2 ++ src/apm_driver.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/apm.h b/src/apm.h index 97b02ac..95cdc55 100644 --- a/src/apm.h +++ b/src/apm.h @@ -243,8 +243,10 @@ extern void ApmAdjustFrame(int scrnIndex, int x, int y, int flags); extern void ApmHWCursorReserveSpace(ApmPtr pApm); extern void ApmAccelReserveSpace(ApmPtr pApm); +#ifdef XF86RUSH extern int ApmPixmapIndex; #define APM_GET_PIXMAP_PRIVATE(pix)\ ((ApmPixmapPtr)(((PixmapPtr)(pix))->devPrivates[ApmPixmapIndex].ptr)) +#endif #include "apm_regs.h" diff --git a/src/apm_driver.c b/src/apm_driver.c index 9e4603a..f7f325a 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -55,8 +55,10 @@ static void ApmDisplayPowerManagementSet(ScrnInfoPtr pScrn, static void ApmProbeDDC(ScrnInfoPtr pScrn, int index); +#ifdef XF86RUSH int ApmPixmapIndex = -1; static unsigned long ApmGeneration = 0; +#endif _X_EXPORT DriverRec APM = { APM_VERSION, @@ -2121,6 +2123,7 @@ ApmScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options); } +#ifdef XF86RUSH if (ApmGeneration != serverGeneration) { if ((ApmPixmapIndex = AllocatePixmapPrivateIndex()) < 0) return FALSE; @@ -2129,6 +2132,7 @@ ApmScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (!AllocatePixmapPrivate(pScreen, ApmPixmapIndex, sizeof(ApmPixmapRec))) return FALSE; +#endif /* Done */ return TRUE; -- 1.5.4.3