replace color table FloatTable boolean with Type enum

[mesa.git] / src / mesa / main / glheader.h

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index ef4c9f0a12587f5d258b264acc3c560a4fb87b7e..a75c65dd4aa0367dbd88ca4f5bfa6d6241354020 100644 (file)
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -1,7 +1,7 @@
 /**
  * \file glheader.h
  * Top-most include file.
- * 
+ *
  * This is the top-most include file of the Mesa sources.
  * It includes gl.h and all system headers which are needed.
  * Other Mesa source files should \e not directly include any system
@@ -9,7 +9,7 @@
  * allows system-dependent hacks/workarounds to be collected in one place.
  *
  * \note Actually, a lot of system-dependent stuff is now in imports.[ch].
- * 
+ *
  * If you touch this file, everything gets recompiled!
  *
  * This file should be included before any other header in the .c files.
@@ -20,9 +20,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -75,12 +75,16 @@
 #endif
 
 
-#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
 #      define __WIN32__
 #      define finite _finite
 #endif
 
-#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
+#if defined(__WATCOMC__)
+#      define finite _finite
+#endif
+
+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
 #  pragma warning( disable : 4068 ) /* unknown pragma */
 #  pragma warning( disable : 4710 ) /* function 'foo' not inlined */
 #  pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
@@ -103,9 +107,9 @@
 #    define WGLAPI __declspec(dllimport)
 #  endif /* _STATIC_MESA support */
 #  define GLAPIENTRY __stdcall
-#  define GLAPIENTRYP __stdcall *
+#  define GLAPIENTRYP GLAPIENTRY *
 #  define GLCALLBACK __stdcall
-#  define GLCALLBACKP __stdcall *
+#  define GLCALLBACKP GLCALLBACK *
 #  if defined(__CYGWIN__)
 #    define GLCALLBACKPCAST *
 #  else
@@ -113,11 +117,13 @@
 #  endif
 #  define GLWINAPI __stdcall
 #  define GLWINAPIV __cdecl
-#else
+#elif !defined(BUILD_FOR_SNAP)
 /* non-Windows compilation */
 #  define GLAPI extern
 #  define GLAPIENTRY
-#  define GLAPIENTRYP *
+#  ifndef GLAPIENTRYP
+#    define GLAPIENTRYP *
+#  endif
 #  define GLCALLBACK
 #  define GLCALLBACKP *
 #  define GLCALLBACKPCAST *
@@ -127,7 +133,7 @@
 
 /* compatibility guard so we don't need to change client code */
 
-#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_WINDEF_H) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
 #if 0
 #      define CALLBACK GLCALLBACK
 typedef void *HGLRC;
@@ -142,7 +148,7 @@ typedef unsigned long COLORREF;
 #define GL_GLEXT_PROTOTYPES
 
 
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WINGDI_H) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(BUILD_FOR_SNAP) 
 #      define WGL_FONT_LINES      0
 #      define WGL_FONT_POLYGONS   1
 #ifndef _GNU_H_WINDOWS32_FUNCTIONS
@@ -158,7 +164,7 @@ typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIP
 typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
 typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
 #if !defined(GLX_USE_MESA)
-#include <gl/mesa_wgl.h>
+#include <GL/mesa_wgl.h>
 #endif
 #endif
 
@@ -196,7 +202,7 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
 
 
 #ifndef CAPI
-#ifdef WIN32
+#if defined(WIN32) && !defined(BUILD_FOR_SNAP)
 #define CAPI _cdecl
 #else
 #define CAPI
@@ -222,7 +228,7 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
  * than GNU C
  */
 #ifndef _ASMAPI
-#if !defined( __GNUC__ ) && !defined( VMS )
+#if defined(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/
 #define _ASMAPI __cdecl
 #else
 #define _ASMAPI
@@ -252,22 +258,15 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
 #  define INLINE __inline
 #elif defined(__ICL)
 #  define INLINE __inline
+#elif defined(__INTEL_COMPILER)
+#  define INLINE inline
+#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
+#  define INLINE __inline
 #else
 #  define INLINE
 #endif
 
 
-/*
- * Provide a reasonable replacement for __FUNCTION__ when using
- * non-GNU C compilers.
- */
-#if !defined(__GNUC__)
-#define STRINGIZE(x) #x
-#define STRINGIZE_EVAL(x) STRINGIZE(x)
-#define __FUNCTION__ STRINGIZE_EVAL(__FILE__) ", line " STRINGIZE_EVAL(__LINE__)
-#endif
-
-
 /* Some compilers don't like some of Mesa's const usage */
 #ifdef NO_CONST
 #  define CONST
@@ -276,7 +275,9 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
 #endif
 
 
-#ifdef DEBUG
+#if defined(BUILD_FOR_SNAP) && defined(CHECKED)
+#  define ASSERT(X)   _CHECK(X) 
+#elif defined(DEBUG)
 #  define ASSERT(X)   assert(X)
 #else
 #  define ASSERT(X)