summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2004-02-18 21:30:12 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2004-02-18 21:30:12 +0000
commit07109fd63e0999905e6f7df8fd7f9c713d0dc2cc (patch)
treebc4aa76ffdc8d4c7b8facabaacd676cd43f33ac1
parentd17586c4dc858d0127fa021e6db62f8cc28ef7a6 (diff)
Sun cc on Solaris x86 defines __i386 but not __i386__ so the x86
architecture #ifdef should accept either form
-rw-r--r--hw/xfree86/os-support/bus/Pci.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index 74ca95baf..dccc6cee4 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v 1.44 2003/11/07 23:57:47 dawes Exp $ */
/*
* Copyright 1998 by Concurrent Computer Corporation
@@ -261,7 +262,7 @@
# define INCLUDE_XF86_NO_DOMAIN
# endif
# define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__i386)
# define ARCH_PCI_INIT ix86PciInit
# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN