Commit f77f1d50 authored by Kevin E Martin's avatar Kevin E Martin
Browse files

Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith).

parent 3dbaeb2e
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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_ #ifndef _FB_H_
#define _FB_H_ #define _FB_H_
...@@ -108,6 +108,7 @@ typedef unsigned __int64 FbBits; ...@@ -108,6 +108,7 @@ typedef unsigned __int64 FbBits;
defined(__sparc64__) || defined(_LP64) || \ defined(__sparc64__) || defined(_LP64) || \
defined(__s390x__) || \ defined(__s390x__) || \
defined(amd64) || defined (__amd64__) || \ defined(amd64) || defined (__amd64__) || \
defined (__powerpc64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64)) (defined(sgi) && (_MIPS_SZLONG == 64))
typedef unsigned long FbBits; typedef unsigned long FbBits;
# else # else
......
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
# define INCLUDE_XF86_MAP_PCI_MEM # define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN # define INCLUDE_XF86_NO_DOMAIN
# endif # endif
#elif defined(__powerpc__) #elif defined(__powerpc__) || defined(__powerpc64__)
# if defined(linux) # if defined(linux)
# define ARCH_PCI_INIT linuxPciInit # define ARCH_PCI_INIT linuxPciInit
# define INCLUDE_XF86_MAP_PCI_MEM # define INCLUDE_XF86_MAP_PCI_MEM
......
...@@ -185,6 +185,7 @@ extern Bool Must_have_memory; ...@@ -185,6 +185,7 @@ extern Bool Must_have_memory;
defined(__sparc64__) || \ defined(__sparc64__) || \
defined(__s390x__) || \ defined(__s390x__) || \
defined(__amd64__) || defined(amd64) || \ defined(__amd64__) || defined(amd64) || \
defined(__powerpc64__) || \
(defined(sgi) && _MIPS_SZLONG == 64)) (defined(sgi) && _MIPS_SZLONG == 64))
#define MAGIC 0x1404196414071968 #define MAGIC 0x1404196414071968
#define MAGIC_FREE 0x1506196615061966 #define MAGIC_FREE 0x1506196615061966
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment