summaryrefslogtreecommitdiff
path: root/hw/xfree86/os-support/misc
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-06-24 14:37:06 -0400
committerAdam Jackson <ajax@redhat.com>2008-06-24 14:37:06 -0400
commit9719354ae04a41e9834ac9ba8fd9e895092ba4f1 (patch)
tree3925ed7d809d796a81dd849dd4fefb0f20e1d152 /hw/xfree86/os-support/misc
parent249c892784ca5e8c75863dd82097ca2bedec4723 (diff)
Check for __amd64__, not __x86_64__.
Spiritual revert of 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe. Intel's C compiler claims to be gcc-compatible; if they're not defining the same macros as gcc then that's their bug, not ours. Even if we were to do this aliasing we should do it once and for all in servermd.h.
Diffstat (limited to 'hw/xfree86/os-support/misc')
-rw-r--r--hw/xfree86/os-support/misc/SlowBcopy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c
index 5cd716823..7c51fcca3 100644
--- a/hw/xfree86/os-support/misc/SlowBcopy.c
+++ b/hw/xfree86/os-support/misc/SlowBcopy.c
@@ -30,7 +30,7 @@ xf86SetReallySlowBcopy(void)
really_slow_bcopy = 1;
}
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__amd64__)
static void xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int len)
{
while(len--)
@@ -45,7 +45,7 @@ static void xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int l
_X_EXPORT void
xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len)
{
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__amd64__)
if (really_slow_bcopy) {
xf86_really_slow_bcopy(src, dst, len);
return;