From 8fc64edc62548a0e46f0efa273b214ede8986760 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 15 Mar 2004 15:37:39 +0000 Subject: [PATCH] 38. Backing out patch 27 as it was inappropriate for the RELEASE branch and bogus anyway (see bugzilla #303) (Egbert Eich). 37. backing out 30.: the sleep() exists to bring the log message to the attention of the user which points to a problem elsewhere. Therefore the problem should be fixed where it originates. To be strict we could make the function fail instead of just trying to point the user at the problem (Egbert Eich). --- fb/fb.h | 1 - hw/xfree86/os-support/bus/Pci.h | 2 +- os/xalloc.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/fb/fb.h b/fb/fb.h index d43e59493..f90a3499e 100644 --- a/fb/fb.h +++ b/fb/fb.h @@ -106,7 +106,6 @@ typedef unsigned __int64 FbBits; defined(__sparc64__) || \ 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 b19e9f1c4..b0c767d5c 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__) || defined(__powerpc64__) +#elif defined(__powerpc__) # 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 6740e89cb..5677896dc 100644 --- a/os/xalloc.c +++ b/os/xalloc.c @@ -185,7 +185,6 @@ 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