Remove carriage returns.

3 files changed, 23 insertions, 23 deletions

diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 423466aef3..b6eed5810c 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -54,7 +54,7 @@ _mesa_GetString( GLenum name )
    static const char *version_1_3 = "1.3 Mesa " MESA_VERSION_STRING;
    static const char *version_1_4 = "1.4 Mesa " MESA_VERSION_STRING;
    static const char *version_1_5 = "1.5 Mesa " MESA_VERSION_STRING;
-   static const char *version_2_0 = "1.5 Mesa " MESA_VERSION_STRING;/*XXX FIX*/

+   static const char *version_2_0 = "1.5 Mesa " MESA_VERSION_STRING;/*XXX FIX*/
    static const char *sl_version_110 = "1.10 Mesa " MESA_VERSION_STRING;
 
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
@@ -126,12 +126,12 @@ _mesa_GetString( GLenum name )
       case GL_EXTENSIONS:
          if (!ctx->Extensions.String)
             ctx->Extensions.String = _mesa_make_extension_string(ctx);
-         return (const GLubyte *) ctx->Extensions.String;

-#if FEATURE_ARB_shading_language_100

-      case GL_SHADING_LANGUAGE_VERSION_ARB:

-         if (ctx->Extensions.ARB_shading_language_100)

-            return (const GLubyte *) sl_version_110;

-         goto error;

+         return (const GLubyte *) ctx->Extensions.String;
+#if FEATURE_ARB_shading_language_100
+      case GL_SHADING_LANGUAGE_VERSION_ARB:
+         if (ctx->Extensions.ARB_shading_language_100)
+            return (const GLubyte *) sl_version_110;
+         goto error;
 #endif
 #if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program || \
     FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
@@ -143,7 +143,7 @@ _mesa_GetString( GLenum name )
             return (const GLubyte *) ctx->Program.ErrorString;
          }
          /* FALL-THROUGH */
-#endif

+#endif
       error:
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index afa5fc1c7f..5a986f2395 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -295,17 +295,17 @@ _mesa_sin(double a)
 #else
    return sin(a);
 #endif
-}

-

-/** Single precision wrapper around either sin() or xf86sin() */

-float

-_mesa_sinf(float a)

-{

-#if defined(XFree86LOADER) && defined(IN_MODULE)

-   return (float) xf86sin((double) a);

-#else

-   return (float) sin((double) a);

-#endif

+}
+
+/** Single precision wrapper around either sin() or xf86sin() */
+float
+_mesa_sinf(float a)
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return (float) xf86sin((double) a);
+#else
+   return (float) sin((double) a);
+#endif
 }
 
 /** Wrapper around either cos() or xf86cos() */
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 35ec1547e9..63f88b7229 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -125,11 +125,11 @@ _mesa_light(GLcontext *ctx, GLuint lnum, GLenum pname, const GLfloat *params)
       if (light->SpotCutoff == params[0])
          return;
       FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      light->SpotCutoff = params[0];

+      light->SpotCutoff = params[0];
       light->_CosCutoffNeg = (GLfloat) (_mesa_cos(light->SpotCutoff * DEG2RAD));
       if (light->_CosCutoffNeg < 0)
-         light->_CosCutoff = 0;

-      else

+         light->_CosCutoff = 0;
+      else
          light->_CosCutoff = light->_CosCutoffNeg;
       if (light->SpotCutoff != 180.0F)
          light->_Flags |= LIGHT_SPOT;
@@ -1265,7 +1265,7 @@ init_light( struct gl_light *l, GLuint n )
    ASSIGN_3V( l->EyeDirection, 0.0, 0.0, -1.0 );
    l->SpotExponent = 0.0;
    _mesa_invalidate_spot_exp_table( l );
-   l->SpotCutoff = 180.0;

+   l->SpotCutoff = 180.0;
    l->_CosCutoffNeg = -1.0f;
    l->_CosCutoff = 0.0;		/* KW: -ve values not admitted */
    l->ConstantAttenuation = 1.0;