Re: X Strike Force X.Org X11 SVN commit: r795 - in branches/6.9/debian: . scripts
On Mon, Oct 31, 2005 at 11:07:18 -0500, David Nusinow wrote:
> On Mon, Oct 31, 2005 at 05:01:05PM +0100, Julien Cristau wrote:
> > alpha still needs the build fix I sent in
> > <[🔎] 20051024105341.GM2755@bryan.is-a-geek.org>.
>
> Crap, sorry Julien. I just uploaded -2, but I'll add this in svn now so it
> can go in to -3.
>
Thanks David.
Actually, I just noticed that a different fix has been committed
upstream:
revision 1.10
date: 2005-10-28 16:01:17 +0000; author: alanh; state: Exp; lines: +1 -1; commitid: 24b943624b484567;
build fix on alpha
Index: programs/Xserver/hw/xfree86/common/compiler.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/compiler.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- programs/Xserver/hw/xfree86/common/compiler.h 24 Aug 2005 11:18:32 -0000 1.9
+++ programs/Xserver/hw/xfree86/common/compiler.h 28 Oct 2005 16:01:17 -0000 1.10
@@ -1694,7 +1694,7 @@
xf86ReadMmio32(void *Base, unsigned long Offset)
{
__asm__ __volatile__("mb" : : : "memory");
- return *(volatile CARD32*)((unsigned long)Base+(Offset));
+ return *(volatile unsigned int*)((unsigned long)Base+(Offset));
}
# endif
extern void (*xf86WriteMmio8)(int, void *, unsigned long);
Reply to: