From 1ae528656691f5f296b65b0e8e8e006b63bce235 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Wed, 12 Mar 2008 17:20:38 -0300 Subject: [PATCH] Compile warning fixes. Also rename macro in apm_pcirename.h. --- src/apm_pcirename.h | 6 +++--- src/apm_video.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/apm_pcirename.h b/src/apm_pcirename.h index f0f5cf8..37af438 100644 --- a/src/apm_pcirename.h +++ b/src/apm_pcirename.h @@ -26,8 +26,8 @@ * library. The main purpose being to facilitate source code compatibility. */ -#ifndef CIRPCIRENAME_H -#define CIRPCIRENAME_H +#ifndef APMPCIRENAME_H +#define APMPCIRENAME_H enum region_type { REGION_MEM, @@ -119,4 +119,4 @@ typedef struct pci_device *pciVideoPtr; #endif /* XSERVER_LIBPCIACCESS */ -#endif /* CIRPCIRENAME_H */ +#endif /* APMPCIRENAME_H */ diff --git a/src/apm_video.c b/src/apm_video.c index acf65da..6d3634b 100644 --- a/src/apm_video.c +++ b/src/apm_video.c @@ -514,7 +514,6 @@ static int A(ReputImage)(ScrnInfoPtr pScrn, short drw_x, short drw_y, RegionPtr clipBoxes, pointer pdata, DrawablePtr pDraw) { - ScreenPtr pScreen = pScrn->pScreen; APMDECL(pScrn); ApmPortPrivPtr pPriv = pdata, pPriv0, pPriv1; register int fx, fy; -- 1.5.4.3