Committing in .

 Modified Files:
 	Mesa/macos/gli_api/gliapi1.h Mesa/macos/gli_api/gliapi2.h
 	Mesa/macos/gli_api/gliapiext.h Mesa/macos/src-gli/fxgli.c
 	Mesa/macos/src-gli/fxgli.h Mesa/macos/src-gli/fxgli2.c
 	Mesa/macos/src-gli/fxgli_tridebug.c Mesa/src/accum.c
 	Mesa/src/accum.h Mesa/src/all.h Mesa/src/alpha.c
 	Mesa/src/alpha.h Mesa/src/attrib.c Mesa/src/attrib.h
 	Mesa/src/bitmap.c Mesa/src/bitmap.h Mesa/src/blend.c
 	Mesa/src/blend.h Mesa/src/buffers.c Mesa/src/buffers.h
 	Mesa/src/clip.c Mesa/src/clip.h Mesa/src/colortab.h
 	Mesa/src/config.c Mesa/src/context.c Mesa/src/context.h
 	Mesa/src/convolve.c Mesa/src/convolve.h Mesa/src/copypix.c
 	Mesa/src/copypix.h Mesa/src/debug.c Mesa/src/depth.c
 	Mesa/src/depth.h Mesa/src/dlist.c Mesa/src/dlist.h
 	Mesa/src/drawpix.c Mesa/src/drawpix.h Mesa/src/enable.c
 	Mesa/src/enable.h Mesa/src/eval.c Mesa/src/eval.h
 	Mesa/src/extensions.c Mesa/src/extensions.h
 	Mesa/src/feedback.c Mesa/src/feedback.h Mesa/src/fog.c
 	Mesa/src/fog.h Mesa/src/get.c Mesa/src/get.h Mesa/src/glapi.c
 	Mesa/src/glthread.h Mesa/src/highpc.c Mesa/src/hint.h
 	Mesa/src/histogram.h Mesa/src/image.c Mesa/src/image.h
 	Mesa/src/imports.c Mesa/src/light.c Mesa/src/light.h
 	Mesa/src/lines.c Mesa/src/lines.h Mesa/src/logic.c
 	Mesa/src/logic.h Mesa/src/masking.c Mesa/src/masking.h
 	Mesa/src/matrix.c Mesa/src/matrix.h Mesa/src/pixel.c
 	Mesa/src/pixel.h Mesa/src/points.c Mesa/src/points.h
 	Mesa/src/polygon.c Mesa/src/polygon.h Mesa/src/rastpos.c
 	Mesa/src/readpix.c Mesa/src/scissor.c Mesa/src/scissor.h
 	Mesa/src/state.c Mesa/src/state.h Mesa/src/stencil.c
 	Mesa/src/stencil.h Mesa/src/teximage.c Mesa/src/teximage.h
 	Mesa/src/texobj.c Mesa/src/texobj.h Mesa/src/texstate.c
 	Mesa/src/texstate.h Mesa/src/texture.c Mesa/src/texture.h
 	Mesa/src/texutil.c Mesa/src/texutil.h Mesa/src/varray.c
 	Mesa/src/varray.h Mesa/src/X/fakeglx.c Mesa/src/X/xm_api.c
 	Mesa/src/X/xm_dd.c Mesa/src/X/xm_line.c Mesa/src/X/xm_span.c
 	Mesa/src/X/xm_tri.c Mesa/src/swrast/s_aaline.c
 	Mesa/src/swrast/s_aaline.h Mesa/src/swrast/s_aatriangle.h
 	Mesa/src/swrast/s_accum.h Mesa/src/swrast/s_alpha.h
 	Mesa/src/swrast/s_alphabuf.h Mesa/src/swrast/s_blend.h
 	Mesa/src/swrast/s_context.c Mesa/src/swrast/s_context.h
 	Mesa/src/swrast/s_depth.h Mesa/src/swrast/s_drawpix.h
 	Mesa/src/swrast/s_feedback.h Mesa/src/swrast/s_fog.h
 	Mesa/src/swrast/s_histogram.h Mesa/src/swrast/s_lines.h
 	Mesa/src/swrast/s_logic.h Mesa/src/swrast/s_masking.h
 	Mesa/src/swrast/s_pb.h Mesa/src/swrast/s_pixeltex.h
 	Mesa/src/swrast/s_points.h Mesa/src/swrast/s_quads.c
 	Mesa/src/swrast/s_quads.h Mesa/src/swrast/s_scissor.h
 	Mesa/src/swrast/s_span.h Mesa/src/swrast/s_stencil.h
 	Mesa/src/swrast/s_texture.h Mesa/src/swrast/s_triangle.h
 	Mesa/src/swrast/s_zoom.h Mesa/src/swrast/swrast.h
 	Mesa/src/swrast_setup/ss_context.h
 	Mesa/src/swrast_setup/ss_triangle.c
 	Mesa/src/swrast_setup/ss_triangle.h
 	Mesa/src/swrast_setup/ss_vb.h Mesa/src/tnl/t_clip.c
 	Mesa/src/tnl/t_clip.h Mesa/src/tnl/t_context.c
 	Mesa/src/tnl/t_context.h Mesa/src/tnl/t_cva.c
 	Mesa/src/tnl/t_cva.h Mesa/src/tnl/t_debug.c
 	Mesa/src/tnl/t_debug.h Mesa/src/tnl/t_dlist.h
 	Mesa/src/tnl/t_eval.c Mesa/src/tnl/t_eval.h
 	Mesa/src/tnl/t_fog.c Mesa/src/tnl/t_fog.h
 	Mesa/src/tnl/t_light.c Mesa/src/tnl/t_light.h
 	Mesa/src/tnl/t_pipeline.c Mesa/src/tnl/t_pipeline.h
 	Mesa/src/tnl/t_shade.c Mesa/src/tnl/t_shade.h
 	Mesa/src/tnl/t_stages.c Mesa/src/tnl/t_stages.h
 	Mesa/src/tnl/t_texture.c Mesa/src/tnl/t_texture.h
 	Mesa/src/tnl/t_trans_elt.c Mesa/src/tnl/t_trans_elt.h
 	Mesa/src/tnl/t_varray.c Mesa/src/tnl/t_varray.h
 	Mesa/src/tnl/t_vb.c Mesa/src/tnl/t_vb.h
 	Mesa/src/tnl/t_vbcull.c Mesa/src/tnl/t_vbcull.h
 	Mesa/src/tnl/t_vbfill.c Mesa/src/tnl/t_vbfill.h
 	Mesa/src/tnl/t_vbindirect.c Mesa/src/tnl/t_vbindirect.h
 	Mesa/src/tnl/t_vbrender.c Mesa/src/tnl/t_vbrender.h
 	Mesa/src/tnl/t_vbxform.c Mesa/src/tnl/t_vbxform.h
 	Mesa/src/tnl/tnl.h
 Added Files:
 	Mesa/src/mtypes.h
 Removed Files:
 	Mesa/src/types.h

 Changed Mesa/src/types to Mesa/src/mtypes.h to avoid conflicts while
compiling on a VMS system.

----------------------------------------------------------------------

1 files changed, 31 insertions, 31 deletions

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index a36e6b00be..24a0f031a2 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -1,21 +1,21 @@
-/* $Id: extensions.c,v 1.41 2000/11/17 21:01:25 brianp Exp $ */
+/* $Id: extensions.c,v 1.42 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -33,7 +33,7 @@
 #include "extensions.h"
 #include "mem.h"
 #include "simple_list.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -44,17 +44,17 @@ struct extension {
    GLint enabled;
    GLboolean *flag;			/* optional flag stored elsewhere */
    char name[MAX_EXT_NAMELEN+1];
-   void (*notify)( GLcontext *, GLboolean ); 
+   void (*notify)( GLcontext *, GLboolean );
 };
 
 #define F(x) (int)&(((struct gl_extensions *)0)->x)
 #define ON GL_TRUE
 #define OFF GL_FALSE
 
-static struct { 
-   GLboolean enabled; 
-   const char *name; 
-   int flag_offset; 
+static struct {
+   GLboolean enabled;
+   const char *name;
+   int flag_offset;
 } default_extensions[] = {
    { ON,  "GL_ARB_imaging",                   F(ARB_imaging) },
    { ON,  "GL_ARB_multitexture",              F(ARB_multitexture) },
@@ -80,7 +80,7 @@ static struct {
    { ON,  "GL_EXT_point_parameters",          F(EXT_point_parameters) },
    { ON,  "GL_EXT_polygon_offset",            F(EXT_polygon_offset) },
    { ON,  "GL_EXT_rescale_normal",            F(EXT_rescale_normal) },
-   { ON,  "GL_EXT_secondary_color",           F(EXT_secondary_color) }, 
+   { ON,  "GL_EXT_secondary_color",           F(EXT_secondary_color) },
    { ON,  "GL_EXT_shared_texture_palette",    F(EXT_shared_texture_palette) },
    { ON,  "GL_EXT_stencil_wrap",              F(EXT_stencil_wrap) },
    { ON,  "GL_EXT_texture3D",                 F(EXT_texture3D) },
@@ -125,9 +125,9 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 
 
 
-int gl_extensions_add( GLcontext *ctx, 
-		       GLboolean enabled, 
-		       const char *name, 
+int gl_extensions_add( GLcontext *ctx,
+		       GLboolean enabled,
+		       const char *name,
 		       GLboolean *flag_ptr )
 {
    if (ctx->Extensions.ext_string == 0) {
@@ -151,23 +151,23 @@ int gl_extensions_add( GLcontext *ctx,
 static int set_extension( GLcontext *ctx, const char *name, GLint state )
 {
    struct extension *i;
-   foreach( i, ctx->Extensions.ext_list ) 
-      if (strncmp(i->name, name, MAX_EXT_NAMELEN) == 0) 
+   foreach( i, ctx->Extensions.ext_list )
+      if (strncmp(i->name, name, MAX_EXT_NAMELEN) == 0)
 	 break;
 
    if (i == ctx->Extensions.ext_list)
       return 1;
 
    if (i->flag)
-      *(i->flag) = state;      
+      *(i->flag) = state;
    i->enabled = state;
    return 0;
-}   
+}
 
 
 int gl_extensions_enable( GLcontext *ctx, const char *name )
 {
-   if (ctx->Extensions.ext_string == 0) 
+   if (ctx->Extensions.ext_string == 0)
       return set_extension( ctx, name, 1 );
    return 1;
 }
@@ -175,11 +175,11 @@ int gl_extensions_enable( GLcontext *ctx, const char *name )
 
 int gl_extensions_disable( GLcontext *ctx, const char *name )
 {
-   if (ctx->Extensions.ext_string == 0) 
+   if (ctx->Extensions.ext_string == 0)
       return set_extension( ctx, name, 0 );
    return 1;
 }
-      
+
 
 /*
  * Test if the named extension is enabled in this context.
@@ -213,10 +213,10 @@ void gl_extensions_dtr( GLcontext *ctx )
 	 remove_from_list( i );
 	 FREE( i );
       }
-   
+
       FREE(ctx->Extensions.ext_list);
       ctx->Extensions.ext_list = 0;
-   }      
+   }
 }
 
 
@@ -235,7 +235,7 @@ void gl_extensions_ctr( GLcontext *ctx )
       if (default_extensions[i].flag_offset)
 	 ptr = base + default_extensions[i].flag_offset;
 
-      gl_extensions_add( ctx, 
+      gl_extensions_add( ctx,
 			 default_extensions[i].enabled,
 			 default_extensions[i].name,
 			 ptr);
@@ -245,22 +245,22 @@ void gl_extensions_ctr( GLcontext *ctx )
 
 const char *gl_extensions_get_string( GLcontext *ctx )
 {
-   if (ctx->Extensions.ext_string == 0) 
+   if (ctx->Extensions.ext_string == 0)
    {
       struct extension *i;
       char *str;
       GLuint len = 0;
-      foreach (i, ctx->Extensions.ext_list) 
+      foreach (i, ctx->Extensions.ext_list)
 	 if (i->enabled)
 	    len += strlen(i->name) + 1;
-      
-      if (len == 0) 
+
+      if (len == 0)
 	 return "";
 
       str = (char *)MALLOC(len * sizeof(char));
       ctx->Extensions.ext_string = str;
 
-      foreach (i, ctx->Extensions.ext_list) 
+      foreach (i, ctx->Extensions.ext_list)
 	 if (i->enabled) {
 	    strcpy(str, i->name);
 	    str += strlen(str);
@@ -269,6 +269,6 @@ const char *gl_extensions_get_string( GLcontext *ctx )
 
       *(str-1) = 0;
    }
-      
+
    return ctx->Extensions.ext_string;
 }