Mesa 6.3.1 merge

[Alan Coopersmith]

Alan Coopersmith wrote:
>  > 6.3.1 merged.  Please build and test.
> 
> I needed the attached patches to build successfully on Solaris x86 with
> Sun compilers.

Oh, and these to avoid undefined symbol __builtin_expect errors when linking
software against libGL built with compilers other than gcc 3.x/4.x.

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering
-------------- next part --------------
Index: indirect_vertex_program.c
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/glx/x11/indirect_vertex_program.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 indirect_vertex_program.c
--- indirect_vertex_program.c	31 Jul 2005 16:45:54 -0000	1.1.1.1
+++ indirect_vertex_program.c	1 Aug 2005 01:30:44 -0000
@@ -29,6 +29,7 @@
 #include "glxclient.h"
 #include "indirect_vertex_array.h"
 #include <GL/glxproto.h>
+#include "glheader.h"
 
 void do_vertex_attrib_enable( GLuint index, GLboolean val )
 {
Index: pixelstore.c
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/glx/x11/pixelstore.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pixelstore.c
--- pixelstore.c	31 Jul 2005 16:45:54 -0000	1.1.1.1
+++ pixelstore.c	1 Aug 2005 01:30:44 -0000
@@ -36,6 +36,7 @@
 
 #include "glxclient.h"
 #include "indirect.h"
+#include "glheader.h"
 
 /**
  * Send glPixelStore command to the server