[Xorg-commit] xc/extras/Mesa/include/GL glxext.h,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/extras/Mesa/include/GL
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/Mesa/include/GL

Modified Files:
      Tag: XORG-CURRENT
	glxext.h 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: glxext.h
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/include/GL/glxext.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/glxext.h	6 Dec 2003 13:22:42 -0000	1.1.4.2
+++ b/glxext.h	23 Feb 2004 21:31:54 -0000	1.1.4.3
@@ -33,7 +33,7 @@
 ** not been independently verified as being compliant with the OpenGL(R)
 ** version 1.2.1 Specification.
 */
-/* $XFree86: xc/extras/Mesa/include/GL/glxext.h,v 1.4 2003/11/29 01:31:20 dawes Exp $ */
+/* $XFree86: xc/extras/Mesa/include/GL/glxext.h,v 1.6 2004/01/13 02:42:51 tsi Exp $ */
 /* $XdotOrg$ */
 
 #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
@@ -317,11 +317,15 @@
 } GLXBufferClobberEventSGIX;
 #endif
 
-#ifdef __UNIXOS2__
+#if defined(__UNIXOS2__) || defined(__SOL64__)
 typedef long int int32_t;
 typedef long long int int64_t;
 #endif
 
+#if defined(SCO) || defined(__USLC__)
+#include <stdint.h>
+#endif
+
 #ifndef GLX_VERSION_1_3
 #define GLX_VERSION_1_3 1
 #ifdef GLX_GLXEXT_PROTOTYPES