diff options
| author | Kevin E Martin <kem@kem.org> | 2004-08-11 21:14:18 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2004-08-11 21:14:18 +0000 |
| commit | f77f1d50723aceb5059a96f7a4068046b7961c51 (patch) | |
| tree | c00eea6fc69639f20b2c0160c9642b9f0737b117 | |
| parent | 3dbaeb2e126d9424b21df91f0be9129c4eea6f1b (diff) | |
Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith).
| -rw-r--r-- | fb/fb.h | 3 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/Pci.h | 2 | ||||
| -rw-r--r-- | os/xalloc.c | 1 |
3 files changed, 4 insertions, 2 deletions
@@ -22,7 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.4 2004/06/21 13:51:57 ago Exp $ */ +/* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.5 2004/07/30 20:30:51 ajax Exp $ */ #ifndef _FB_H_ #define _FB_H_ @@ -108,6 +108,7 @@ typedef unsigned __int64 FbBits; defined(__sparc64__) || defined(_LP64) || \ defined(__s390x__) || \ defined(amd64) || defined (__amd64__) || \ + defined (__powerpc64__) || \ (defined(sgi) && (_MIPS_SZLONG == 64)) typedef unsigned long FbBits; # else diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 2d85eba9a..3e965265b 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -280,7 +280,7 @@ # define INCLUDE_XF86_MAP_PCI_MEM # define INCLUDE_XF86_NO_DOMAIN # endif -#elif defined(__powerpc__) +#elif defined(__powerpc__) || defined(__powerpc64__) # if defined(linux) # define ARCH_PCI_INIT linuxPciInit # define INCLUDE_XF86_MAP_PCI_MEM diff --git a/os/xalloc.c b/os/xalloc.c index 5677896dc..6740e89cb 100644 --- a/os/xalloc.c +++ b/os/xalloc.c @@ -185,6 +185,7 @@ extern Bool Must_have_memory; defined(__sparc64__) || \ defined(__s390x__) || \ defined(__amd64__) || defined(amd64) || \ + defined(__powerpc64__) || \ (defined(sgi) && _MIPS_SZLONG == 64)) #define MAGIC 0x1404196414071968 #define MAGIC_FREE 0x1506196615061966 |