Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[mesa.git] / src / mesa / swrast / s_fog.h

diff --git a/src/mesa/swrast/s_fog.h b/src/mesa/swrast/s_fog.h
index f5744b1d952507b6011cdf56feea12820225b7e1..50760d88af752790f457ef2643b49f665a4f583c 100644 (file)
--- a/src/mesa/swrast/s_fog.h
+++ b/src/mesa/swrast/s_fog.h
@@ -28,7 +28,6 @@
 #define S_FOG_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 
@@ -36,10 +35,10 @@ extern GLfloat
 _swrast_z_to_fogfactor(GLcontext *ctx, GLfloat z);
 
 extern void
-_swrast_fog_rgba_span( const GLcontext *ctx, struct sw_span *span );
+_swrast_fog_rgba_span( const GLcontext *ctx, SWspan *span );
 
 extern void
-_swrast_fog_ci_span( const GLcontext *ctx, struct sw_span *span );
+_swrast_fog_ci_span( const GLcontext *ctx, SWspan *span );
 
 
 #endif