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, 54 insertions, 54 deletions

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index b373f70107..21b9a0f0fe 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,21 +1,21 @@
-/* $Id: get.c,v 1.42 2000/11/19 23:10:25 brianp Exp $ */
+/* $Id: get.c,v 1.43 2000/11/22 07:32:17 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
@@ -37,7 +37,7 @@
 #include "get.h"
 #include "macros.h"
 #include "mmath.h"
-#include "types.h"
+#include "mtypes.h"
 
 #include "math/m_matrix.h"
 #endif
@@ -97,7 +97,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
    if (!params)
       return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
+   if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glGetBooleanv %s\n", gl_lookup_enum_by_nr(pname));
 
    if (ctx->Driver.GetBooleanv
@@ -844,7 +844,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
 	 break;
       case GL_TEXTURE_MATRIX:
 	 for (i=0;i<16;i++) {
-	    params[i] = 
+	    params[i] =
 	       FLOAT_TO_BOOL(ctx->TextureMatrix[texTransformUnit].m[i]);
 	 }
 	 break;
@@ -1035,12 +1035,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_FALSE && 
+			      ctx->Hint.AllowDrawFrg == GL_FALSE &&
 			      ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_TRUE && 
+			      ctx->Hint.AllowDrawFrg == GL_TRUE &&
 			      ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -1235,12 +1235,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
       case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
          *params = ctx->Pixel.PostColorMatrixColorTableEnabled;
          break;
-	 
+	
       /* GL_EXT_secondary_color */
-      case GL_COLOR_SUM_EXT: 
+      case GL_COLOR_SUM_EXT:
 	 *params = ctx->Fog.ColorSumEnabled;
 	 break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT: 
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
          params[0] = INT_TO_BOOL(ctx->Current.SecondaryColor[0]);
          params[1] = INT_TO_BOOL(ctx->Current.SecondaryColor[1]);
@@ -1249,28 +1249,28 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
       case GL_SECONDARY_COLOR_ARRAY_EXT:
          *params = ctx->Array.SecondaryColor.Enabled;
          break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
 	 *params = ENUM_TO_BOOL(ctx->Array.SecondaryColor.Type);
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
 	 *params = INT_TO_BOOL(ctx->Array.SecondaryColor.Stride);
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
 	 *params = INT_TO_BOOL(ctx->Array.SecondaryColor.Stride);
 	 break;
 
       /* GL_EXT_fog_coord */
-      case GL_CURRENT_FOG_COORDINATE_EXT: 
+      case GL_CURRENT_FOG_COORDINATE_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
 	 *params = FLOAT_TO_BOOL(ctx->Current.FogCoord);
 	 break;
       case GL_FOG_COORDINATE_ARRAY_EXT:
          *params = ctx->Array.FogCoord.Enabled;
          break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
 	 *params = ENUM_TO_BOOL(ctx->Array.FogCoord.Type);
 	 break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
 	 *params = INT_TO_BOOL(ctx->Array.FogCoord.Stride);
 	 break;
 
@@ -1296,7 +1296,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
    if (!params)
       return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
+   if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glGetDoublev %s\n", gl_lookup_enum_by_nr(pname));
 
    if (ctx->Driver.GetDoublev && (*ctx->Driver.GetDoublev)(ctx, pname, params))
@@ -2233,12 +2233,12 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_FALSE && 
+			      ctx->Hint.AllowDrawFrg == GL_FALSE &&
 			      ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_TRUE && 
+			      ctx->Hint.AllowDrawFrg == GL_TRUE &&
 			      ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -2435,10 +2435,10 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
          break;
 
       /* GL_EXT_secondary_color */
-      case GL_COLOR_SUM_EXT: 
+      case GL_COLOR_SUM_EXT:
 	 *params = (GLdouble) ctx->Fog.ColorSumEnabled;
 	 break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT: 
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
          params[0] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[0]);
          params[1] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[1]);
@@ -2447,28 +2447,28 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
       case GL_SECONDARY_COLOR_ARRAY_EXT:
          *params = (GLdouble) ctx->Array.SecondaryColor.Enabled;
          break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
 	 *params = (GLdouble) ctx->Array.SecondaryColor.Type;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
 	 *params = (GLdouble) ctx->Array.SecondaryColor.Stride;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
 	 *params = (GLdouble) ctx->Array.SecondaryColor.Stride;
 	 break;
 
       /* GL_EXT_fog_coord */
-      case GL_CURRENT_FOG_COORDINATE_EXT: 
+      case GL_CURRENT_FOG_COORDINATE_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
 	 *params = (GLdouble) ctx->Current.FogCoord;
 	 break;
       case GL_FOG_COORDINATE_ARRAY_EXT:
          *params = (GLdouble) ctx->Array.FogCoord.Enabled;
          break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
 	 *params = (GLdouble) ctx->Array.FogCoord.Type;
 	 break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
 	 *params = (GLdouble) ctx->Array.FogCoord.Stride;
 	 break;
 
@@ -2495,7 +2495,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
    if (!params)
       return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
+   if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glGetFloatv %s\n", gl_lookup_enum_by_nr(pname));
 
    if (ctx->Driver.GetFloatv && (*ctx->Driver.GetFloatv)(ctx, pname, params))
@@ -3434,12 +3434,12 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_FALSE && 
+			      ctx->Hint.AllowDrawFrg == GL_FALSE &&
 			      ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_TRUE && 
+			      ctx->Hint.AllowDrawFrg == GL_TRUE &&
 			      ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -3608,10 +3608,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          break;
 
       /* GL_EXT_secondary_color */
-      case GL_COLOR_SUM_EXT: 
+      case GL_COLOR_SUM_EXT:
 	 *params = (GLfloat) ctx->Fog.ColorSumEnabled;
 	 break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT: 
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
          params[0] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[0]);
          params[1] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[1]);
@@ -3620,28 +3620,28 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
       case GL_SECONDARY_COLOR_ARRAY_EXT:
          *params = (GLfloat) ctx->Array.SecondaryColor.Enabled;
          break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
 	 *params = (GLfloat) ctx->Array.SecondaryColor.Type;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
 	 *params = (GLfloat) ctx->Array.SecondaryColor.Stride;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
 	 *params = (GLfloat) ctx->Array.SecondaryColor.Stride;
 	 break;
 
       /* GL_EXT_fog_coord */
-      case GL_CURRENT_FOG_COORDINATE_EXT: 
+      case GL_CURRENT_FOG_COORDINATE_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
 	 *params = (GLfloat) ctx->Current.FogCoord;
 	 break;
       case GL_FOG_COORDINATE_ARRAY_EXT:
          *params = (GLfloat) ctx->Array.FogCoord.Enabled;
          break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
 	 *params = (GLfloat) ctx->Array.FogCoord.Type;
 	 break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
 	 *params = (GLfloat) ctx->Array.FogCoord.Stride;
 	 break;
 
@@ -3668,7 +3668,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
    if (!params)
       return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
+   if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glGetIntegerv %s\n", gl_lookup_enum_by_nr(pname));
 
    if (ctx->Driver.GetIntegerv
@@ -4607,12 +4607,12 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (ctx->Hint.AllowDrawWin == GL_TRUE &&
-		    ctx->Hint.AllowDrawFrg == GL_FALSE && 
+		    ctx->Hint.AllowDrawFrg == GL_FALSE &&
 		    ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params =  (ctx->Hint.AllowDrawWin == GL_TRUE &&
-		     ctx->Hint.AllowDrawFrg == GL_TRUE && 
+		     ctx->Hint.AllowDrawFrg == GL_TRUE &&
 		     ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -4648,7 +4648,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
       case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
 	 *params = ctx->Array.LockCount;
 	 break;
-	 
+	
       /* GL_ARB_transpose_matrix */
       case GL_TRANSPOSE_COLOR_MATRIX_ARB:
          {
@@ -4810,10 +4810,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
 
 
       /* GL_EXT_secondary_color */
-      case GL_COLOR_SUM_EXT: 
+      case GL_COLOR_SUM_EXT:
 	 *params = (GLint) ctx->Fog.ColorSumEnabled;
 	 break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT: 
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
          params[0] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.SecondaryColor[0] ) );
          params[1] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.SecondaryColor[1] ) );
@@ -4822,28 +4822,28 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
       case GL_SECONDARY_COLOR_ARRAY_EXT:
          *params = (GLint) ctx->Array.SecondaryColor.Enabled;
          break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
 	 *params = (GLint) ctx->Array.SecondaryColor.Type;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
 	 *params = (GLint) ctx->Array.SecondaryColor.Stride;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
 	 *params = (GLint) ctx->Array.SecondaryColor.Stride;
 	 break;
 
       /* GL_EXT_fog_coord */
-      case GL_CURRENT_FOG_COORDINATE_EXT: 
+      case GL_CURRENT_FOG_COORDINATE_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
 	 *params = (GLint) ctx->Current.FogCoord;
 	 break;
       case GL_FOG_COORDINATE_ARRAY_EXT:
          *params = (GLint) ctx->Array.FogCoord.Enabled;
          break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
 	 *params = (GLint) ctx->Array.FogCoord.Type;
 	 break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
 	 *params = (GLint) ctx->Array.FogCoord.Stride;
 	 break;
 
@@ -4865,7 +4865,7 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
    if (!params)
       return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
+   if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glGetPointerv %s\n", gl_lookup_enum_by_nr(pname));
 
    if (ctx->Driver.GetPointerv