andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OpenBSD doesn't define __x86_64__, simplify tests.

Browse Source 
Seeing as this code seems to be specific to OpenBSD I don't think
__x86_64__ should have been added there at all. It appears to have
been added wherever __amd64__ existed before which is wrong. I
think that part of the commit should be reverted but also all four of
the checks should be __OpenBSD__ && __amd64__ instead of two one
direction and two flipped.
This commit is contained in:
Brad Smith 2008-05-17 13:14:31 +02:00 committed by Matthieu Herrb
parent 895d4e274d
commit 93c082a060
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/os-support/bsd/i386_video.c
View File

@ -55,7 +55,7 @@
#endif
#endif
#if defined(__OpenBSD__) && (defined(__amd64__) || defined(__x86_64__))
#if defined(__OpenBSD__) && defined(__amd64__)
#include <machine/mtrr.h>
#include <machine/sysarch.h>
#endif
@ -108,7 +108,7 @@ static pointer NetBSDsetWC(int, unsigned long, unsigned long, Bool,
MessageType);
static void NetBSDundoWC(int, pointer);
#endif
#if (defined(__amd64__) || defined(__x86_64__)) && defined(__OpenBSD__)
#if defined(__OpenBSD__) && defined(__amd64__)
static pointer amd64setWC(int, unsigned long, unsigned long, Bool,
MessageType);
static void amd64undoWC(int, pointer);
@ -229,7 +229,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
pVidMem->setWC = NetBSDsetWC;
pVidMem->undoWC = NetBSDundoWC;
#endif
#if (defined(__amd64__) || defined(__x86_64__)) && defined(__OpenBSD__)
#if defined(__OpenBSD__) && defined(__amd64__)
pVidMem->setWC = amd64setWC;
pVidMem->undoWC = amd64undoWC;
#endif
@ -953,7 +953,7 @@ NetBSDundoWC(int screenNum, pointer list)
}
#endif
#if defined(__OpenBSD__) && (defined(__amd64__) || defined(__x86_64__))
#if defined(__OpenBSD__) && defined(__amd64__)
static pointer
amd64setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
MessageType from)