minor changes to silence compiler warnings

5 files changed, 31 insertions, 23 deletions

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index b17b6052db7..ca6b05c4869 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -1,4 +1,4 @@
-/* $Id: s_context.c,v 1.2 2000/11/05 18:24:40 keithw Exp $ */
+/* $Id: s_context.c,v 1.3 2000/11/10 17:45:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -196,7 +196,7 @@ _swrast_validate_point( GLcontext *ctx, SWvertex *v0 )
    swrast->Point( ctx, v0 );
 }
 
-void 
+static void 
 _swrast_validate_blend_func( GLcontext *ctx, GLuint n,
 			     const GLubyte mask[],
 			     GLchan src[][4], 
@@ -211,7 +211,7 @@ _swrast_validate_blend_func( GLcontext *ctx, GLuint n,
 }
 
 
-void 
+static void 
 _swrast_validate_texture_sample( GLcontext *ctx, GLuint texUnit,
 				 const struct gl_texture_object *tObj,
 				 GLuint n,
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index 4d119eff1e3..d646bd4b28e 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: s_drawpix.c,v 1.2 2000/11/05 18:24:40 keithw Exp $ */
+/* $Id: s_drawpix.c,v 1.3 2000/11/10 17:45:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -36,6 +36,7 @@
 #include "pixel.h"
 
 #include "s_context.h"
+#include "s_drawpix.h"
 #include "s_pixeltex.h"
 #include "s_span.h"
 #include "s_stencil.h"
diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c
index feaf189d4d0..c25a3851759 100644
--- a/src/mesa/swrast/s_lines.c
+++ b/src/mesa/swrast/s_lines.c
@@ -1,4 +1,4 @@
-/* $Id: s_lines.c,v 1.3 2000/11/05 23:18:36 brianp Exp $ */
+/* $Id: s_lines.c,v 1.4 2000/11/10 17:45:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -912,6 +912,8 @@ static void flat_multitextured_line( GLcontext *ctx,
 
 
 #ifdef DEBUG
+extern void
+_mesa_print_line_function(GLcontext *ctx);  /* silence compiler warning */
 void
 _mesa_print_line_function(GLcontext *ctx)
 {
diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c
index a4a889e2ddf..59fadfb8e92 100644
--- a/src/mesa/swrast/s_points.c
+++ b/src/mesa/swrast/s_points.c
@@ -1,4 +1,4 @@
-/* $Id: s_points.c,v 1.2 2000/11/05 18:24:40 keithw Exp $ */
+/* $Id: s_points.c,v 1.3 2000/11/10 17:45:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -852,6 +852,8 @@ dist_atten_antialiased_rgba_point( GLcontext *ctx, SWvertex *vert )
 
 
 #ifdef DEBUG
+extern void
+_mesa_print_point_function(GLcontext *ctx);  /* silence compiler warning */
 void
 _mesa_print_point_function(GLcontext *ctx)
 {
diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h
index c567d799784..88689499fd2 100644
--- a/src/mesa/swrast/swrast.h
+++ b/src/mesa/swrast/swrast.h
@@ -30,6 +30,8 @@
 
 #include "types.h"
 
+
+
 /* The software rasterizer now uses this format for vertices.  Thus a
  * 'RasterSetup' stage or other translation is required between the
  * tnl module and the swrast rasterization functions.  This serves to
@@ -67,33 +69,32 @@ typedef struct {
 
 /* These are the public-access functions exported from swrast.  
  */
-void
+extern void
 _swrast_alloc_buffers( GLcontext *ctx );
 
-GLboolean
+extern GLboolean
 _swrast_CreateContext( GLcontext *ctx );
 
-void
+extern void
 _swrast_DestroyContext( GLcontext *ctx );
 
 
 
-
-void 
+extern void 
 _swrast_Bitmap( GLcontext *ctx, 
 		GLint px, GLint py,
 		GLsizei width, GLsizei height,
 		const struct gl_pixelstore_attrib *unpack,
 		const GLubyte *bitmap );
 
-void
+extern void
 _swrast_CopyPixels( GLcontext *ctx, 
 		    GLint srcx, GLint srcy, 
 		    GLint destx, GLint desty, 
 		    GLsizei width, GLsizei height,
 		    GLenum type );
 
-void
+extern void
 _swrast_DrawPixels( GLcontext *ctx, 
 		    GLint x, GLint y,
 		    GLsizei width, GLsizei height,
@@ -101,51 +102,53 @@ _swrast_DrawPixels( GLcontext *ctx,
 		    const struct gl_pixelstore_attrib *unpack,
 		    const GLvoid *pixels );
 
-void
+extern void
 _swrast_ReadPixels( GLcontext *ctx,
 		    GLint x, GLint y, GLsizei width, GLsizei height,
 		    GLenum format, GLenum type,
 		    const struct gl_pixelstore_attrib *unpack,
 		    GLvoid *pixels );
 
-void 
+extern void 
 _swrast_Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
 	       GLint x, GLint y, GLint width, GLint height );
 
-void
+extern void
 _swrast_Accum( GLcontext *ctx, GLenum op, 
 	       GLfloat value, GLint xpos, GLint ypos, 
 	       GLint width, GLint height );
 
+
 /* Get a pointer to the stipple counter.
  */
-GLuint *
+extern GLuint *
 _swrast_get_stipple_counter_ref( GLcontext *ctx );
 
 
 /* These will always render the correct point/line/triangle for the
  * current state.
  */
-void
+extern void
 _swrast_Point( GLcontext *ctx, SWvertex *v );
 
-void
+extern void
 _swrast_Line( GLcontext *ctx, SWvertex *v0, SWvertex *v1 );
 
-void
+extern void
 _swrast_Triangle( GLcontext *ctx, SWvertex *v0, SWvertex *v1, SWvertex *v2 );
 
-void
+extern void
 _swrast_Quad( GLcontext *ctx, SWvertex *v0, SWvertex *v1, SWvertex *v2, 
 	      SWvertex *v3);
 
-void 
+extern void 
 _swrast_flush( GLcontext *ctx );
 
 
 /* Tell the software rasterizer about core state changes.
  */
-void
+extern void
 _swrast_InvalidateState( GLcontext *ctx, GLuint new_state );
 
+
 #endif