XFree86-Server-4.3.0_12 broken on alpha 5.x
Christian Weisgerber
naddy at mips.inka.de
Wed Feb 11 15:27:02 PST 2004
Kris Kennaway <kris at obsecurity.org> wrote:
> http://bento.freebsd.org/errorlogs/alpha-5-latest/XFree86-Server-4.3.0_12.log
This also affects XFree86-4.3.99.15_1. It is caused by revision
1.7 of <include/sysarch.h>, which now declares
int sysarch(int, void *);
By contrast, xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c
has this:
#ifdef __FreeBSD__
extern int sysarch(int, char *);
#endif
...
static int
sethae(u_int64_t hae)
{
#ifdef __FreeBSD__
#ifndef ALPHA_SETHAE
#define ALPHA_SETHAE 0
#endif
struct parms p;
p.hae = hae;
return (sysarch(ALPHA_SETHAE, (char *)&p));
#endif
Is there a problem with just moving to void* in alpha_video.c? It
should still work fine on 4.x.
--- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Thu Feb 12 00:21:27 2004
+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Thu Feb 12 00:21:46 2004
@@ -483,7 +483,7 @@
writeSparse32(int Value, pointer Base, register unsigned long Offset);
#ifdef __FreeBSD__
-extern int sysarch(int, char *);
+extern int sysarch(int, void *);
#endif
struct parms {
@@ -499,7 +499,7 @@
#endif
struct parms p;
p.hae = hae;
- return (sysarch(ALPHA_SETHAE, (char *)&p));
+ return (sysarch(ALPHA_SETHAE, &p));
#endif
#ifdef __OpenBSD__
return -1;
--
Christian "naddy" Weisgerber naddy at mips.inka.de
More information about the freebsd-x11
mailing list