diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-04-18 03:00:43 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-04-18 03:00:43 +0000 |
| commit | 449e83a9470ec4bdd0871e2f263f608b24455423 (patch) | |
| tree | 9651f5aee7dd1153f14c56cdaac460481f0d309b | |
| parent | 425251a752805affb6ce14baa58d92c384f39501 (diff) | |
xc/lib/GL/glx/Imakefilebefore_20040421_xprint_branch_landing
xc/lib/GL/mesa/src/Imakefile LargePICTable required for Solaris SPARC
builds
xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c
xc/programs/Xserver/hw/xfree86/common/xf86Events.c Add != NULL to if
statements to get past syntax error reported by Sun Forte 6.1 cc.
xc/config/imake/imake.c
xc/config/cf/sun.cf
xc/config/cf/sunLib.tmpl Allow compiling with Sun compilers installed
somewhere other than /opt/SUNWspro
xc/programs/Xserver/hw/xfree86/common/compiler.h
xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h Check for
defined(sparc) as well as defined(__sparc__) since Sun compilers don't
define __sparc__
| -rw-r--r-- | hw/xfree86/common/compiler.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Events.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/Pci.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index f888eb0f6..c101c41cd 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -1732,7 +1732,7 @@ static __inline__ void ppc_flush_icache(char *addr) : : "r"(addr) : "memory"); } -# elif defined(__sparc__) +# elif defined(__sparc__) || defined(sparc) /* * Like powerpc, we provide byteswapping and no byteswapping functions * here with byteswapping as default, drivers that don't need byteswapping diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index fe53dcfd5..3a721a33f 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -49,7 +49,7 @@ */ /* $XConsortium: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */ -/* $XdotOrg: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 1.1.4.3 2003/12/06 13:24:24 kaleb Exp $ */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ @@ -403,7 +403,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg) /* */ /* otherwise fallback to sending a key event message to */ /* the current screen's driver: */ - if (*pScr->HandleMessage) { + if (*pScr->HandleMessage != NULL) { (void) (*pScr->HandleMessage)(pScr->scrnIndex, "KeyEventMessage", message, &retstr); } diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index b0c767d5c..36b4a477e 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -312,7 +312,7 @@ # define INCLUDE_XF86_MAP_PCI_MEM # define INCLUDE_XF86_NO_DOMAIN # endif -#elif defined(__sparc__) +#elif defined(__sparc__) || defined(sparc) # if defined(linux) # define ARCH_PCI_INIT linuxPciInit # define INCLUDE_XF86_MAP_PCI_MEM |