[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/glint pm3_accel.c, 1.1.4.1, 1.1.4.2

[Alan Coopersmith]

Committed by: alanc

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

Modified Files:
      Tag: XORG-CURRENT
	pm3_accel.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: pm3_accel.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c,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/pm3_accel.c	5 Mar 2004 13:40:23 -0000	1.1.4.1
+++ b/pm3_accel.c	18 Apr 2004 03:00:42 -0000	1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * Copyright 2000-2001 by Sven Luther <luther at dpt-info.u-strasbg.fr>.
  *
@@ -384,7 +385,7 @@
     GLINT_SLOW_WRITE_REG(0, StartXSub);
     GLINT_SLOW_WRITE_REG(0, StartY);
     GLINT_SLOW_WRITE_REG(0, GLINTCount);
-    if (*pGlint->AccelInfoRec->Sync)
+    if (*pGlint->AccelInfoRec->Sync != NULL)
     	(*pGlint->AccelInfoRec->Sync)(pScrn);
     TRACE_EXIT("Permedia3InitializeEngine");
 }