From 2fb588620030ad393f8500d60e16144d59e4effe Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 19:54:30 +0000 Subject: Merging XORG-CURRENT into trunk --- hw/xfree86/loader/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'hw/xfree86/loader/loader.c') diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index 39ba510a1..efa60f20a 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -61,7 +61,7 @@ #include #if defined(linux) && \ (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \ - || defined(__AMD64__)) + || defined(__amd64__)) #include #endif #include @@ -368,7 +368,7 @@ LoaderInit(void) #if defined(linux) && \ (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \ - || ( defined __AMD64__ && ! defined UseMMAP && ! defined DoMMAPedMerge)) + || ( defined __amd64__ && ! defined UseMMAP && ! defined DoMMAPedMerge)) /* * The glibc malloc uses mmap for large allocations anyway. This breaks * some relocation types because the offset overflow. See loader.h for more @@ -487,7 +487,7 @@ _LoaderFileToMem(int fd, unsigned long offset, int size, char *label) if ((new_off_bias + size) > new_size) new_size += pagesize; ret = (unsigned long)mmap(0, new_size, MMAP_PROT, MAP_PRIVATE -# ifdef __AMD64__ +# ifdef __amd64__ | MAP_32BIT # endif , fd, new_off); @@ -496,7 +496,7 @@ _LoaderFileToMem(int fd, unsigned long offset, int size, char *label) return (void *)(ret + new_off_bias); # else ret = (unsigned long)mmap(0, size, MMAP_PROT, MAP_PRIVATE -# ifdef __AMD64__ +# ifdef __amd64__ | MAP_32BIT # endif , fd, offset + offsetbias); -- cgit v1.2.3