Attachment 14943 Details for Bug 14739 – 0002-Compile-warning-fixes.patch

[patch] 0002-Compile-warning-fixes.patch

0002-Compile-warning-fixes.patch (text/plain), 1.23 KB, created by Paulo César Pereira de Andrade on 2008-03-07 14:57:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-03-07 14:57:21 UTC

Size: 1.23 KB

patch

obsolete

>From 90514f4037b96d92fc907471182b8a9c7d395801 Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>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
>

Actions: View | Splinter Review

Attachments on bug 14739: 14699 | 14943 | 17753

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.