From 90514f4037b96d92fc907471182b8a9c7d395801 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Fri, 7 Mar 2008 19:30:37 -0300 Subject: [PATCH] Compile warning fixes. Change CirRec FbBase and IObase fields from void * to unsigned char *, so that gcc will not warn about use of void * in math to calculate addresses. Don't declare a variable that is only used when XSERVER_LIBPCIACCESS is defined. --- src/cir.h | 4 ++-- src/cir_driver.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cir.h b/src/cir.h index 205c4d1..628ec0d 100644 --- a/src/cir.h +++ b/src/cir.h @@ -36,8 +36,8 @@ typedef struct { Bool HasFBitBlt; CARD32 IOAddress; CARD32 FbAddress; - void * IOBase; - void * FbBase; + unsigned char * IOBase; + unsigned char * FbBase; long FbMapSize; long IoMapSize; int MinClock; diff --git a/src/cir_driver.c b/src/cir_driver.c index 0ce058d..c7f932d 100644 --- a/src/cir_driver.c +++ b/src/cir_driver.c @@ -323,7 +323,9 @@ CIRProbe(DriverPtr drv, int flags) _X_EXPORT Bool CirMapMem(CirPtr pCir, int scrnIndex) { +#ifndef XSERVER_LIBPCIACCESS int mmioFlags; +#endif #ifdef CIR_DEBUG ErrorF("CirMapMem\n"); -- 1.5.4.3