diff options
| author | Brad Smith <brad@comstyle.com> | 2008-05-17 13:14:31 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@bluenote.herrb.net> | 2008-05-17 13:14:31 +0200 |
| commit | 93c082a060bfa8d2a204c0c57ec3507a8edea087 (patch) | |
| tree | 615005431902cad089bc170a63a72e275334d4a7 | |
| parent | 895d4e274d2b4638f0e6838dfee0e543311dba34 (diff) | |
OpenBSD doesn't define __x86_64__, simplify tests.
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.
| -rw-r--r-- | hw/xfree86/os-support/bsd/i386_video.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index e2f6420d8..505659e5a 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -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) |