[Xorg-commit] xc/programs/Xserver/hw/xfree86/os-support/bus Pci.h,1.1.4.1,1.1.4.2

[Alan Coopersmith]

Committed by: alanc

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus
In directory pdx:/tmp/cvs-serv14249/programs/Xserver/hw/xfree86/os-support/bus

Modified Files:
      Tag: XORG-CURRENT
	Pci.h 
Log Message:
Sun cc on Solaris x86 defines __i386 but not __i386__ so the x86 architecture
#ifdef should accept either form


Index: Pci.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Pci.h	26 Nov 2003 22:49:01 -0000	1.1.4.1
+++ b/Pci.h	18 Feb 2004 21:30:12 -0000	1.1.4.2
@@ -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