[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/common compiler.h, 1.1.4.6, 1.1.4.7 xf86Events.c, 1.1.4.3, 1.1.4.4

[Alan Coopersmith]

Committed by: alanc

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/common
In directory pdx:/tmp/cvs-serv28538/programs/Xserver/hw/xfree86/common

Modified Files:
      Tag: XORG-CURRENT
	compiler.h xf86Events.c 
Log Message:
	* xc/lib/GL/glx/Imakefile
	* 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__



Index: compiler.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/compiler.h,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/compiler.h	30 Mar 2004 14:23:13 -0000	1.1.4.6
+++ b/compiler.h	18 Apr 2004 03:00:42 -0000	1.1.4.7
@@ -1732,7 +1732,7 @@
 		: : "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

Index: xf86Events.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/xf86Events.c	6 Dec 2003 13:24:24 -0000	1.1.4.3
+++ b/xf86Events.c	18 Apr 2004 03:00:42 -0000	1.1.4.4
@@ -403,7 +403,7 @@
 	    /*                                                        */
 	    /* 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);
 	    }