From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 20 Mar 2000 19:26:51 +0000 (+0000)
Subject: Cygwin changes, removed two ARB extensions, now in glext.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ea2d444fac993615c3329ce309066a4d07a8da9;p=mesa.git

Cygwin changes, removed two ARB extensions, now in glext.h
---

diff --git a/include/GL/gl.h b/include/GL/gl.h
index 55cd9df9f1d..d575c9f2331 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.33 2000/02/25 21:01:41 brianp Exp $ */
+/* $Id: gl.h,v 1.34 2000/03/20 19:26:51 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -99,7 +99,7 @@
 
 /* compatability guard so we don't need to change client code */
 
-#if defined(_WIN32) && !defined(_WINDEF_) && !defined(OPENSTEP)
+#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP)
 #	define CALLBACK GLCALLBACK
 typedef int (GLAPIENTRY *PROC)();
 typedef void *HGLRC;
@@ -107,9 +107,10 @@ typedef void *HDC;
 typedef unsigned long COLORREF;
 #endif
 
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(OPENSTEP)
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
 #	define WGL_FONT_LINES      0
 #	define WGL_FONT_POLYGONS   1
+#ifndef _GNU_H_WINDOWS32_FUNCTIONS
 #	ifdef UNICODE
 #		define wglUseFontBitmaps  wglUseFontBitmapsW
 #		define wglUseFontOutlines  wglUseFontOutlinesW
@@ -117,6 +118,7 @@ typedef unsigned long COLORREF;
 #		define wglUseFontBitmaps  wglUseFontBitmapsA
 #		define wglUseFontOutlines  wglUseFontOutlinesA
 #	endif /* !UNICODE */
+#endif /* _GNU_H_WINDOWS32_FUNCTIONS */
 typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
 typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
 typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
@@ -2324,40 +2326,6 @@ GLAPI void GLAPIENTRY glResizeBuffersMESA( void );
 
 
 
-/*
- * GL_ARB_tranpose_matrix (ARB 2)
- */
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB		0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB		0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB			0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB			0x84E6
-
-GLAPI void GLAPIENTRY glLoadTransposeMatrixdARB( const GLdouble m[16] );
-GLAPI void GLAPIENTRY glLoadTransposeMatrixfARB( const GLfloat m[16] );
-GLAPI void GLAPIENTRY glMultTransposeMatrixdARB( const GLdouble m[16] );
-GLAPI void GLAPIENTRY glMultTransposeMatrixfARB( const GLfloat m[16] );
-
-#endif /* GL_ARB_tranpose_matrix */
-
-
-
-/*
- * GL_ARB_multisample (ARB 4)
- */
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-
-GLAPI void GLAPIENTRY glSampleCoverageARB(GLclampf value, GLboolean invert);
-
-GLAPI void GLAPIENTRY glSamplePassARB(GLenum pass);
-
-#endif /* GL_ARB_multisample */
-
-
-
 #if defined(__BEOS__) || defined(__QUICKDRAW__)
 #pragma export off
 #endif