various compilation/warning fixes

8 files changed, 22 insertions, 13 deletions

diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index d5ab089af1..f1b7698a92 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.37 2000/12/28 22:11:04 keithw Exp $
+# $Id: Makefile.X11,v 1.38 2001/01/05 05:31:42 keithw Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
@@ -160,7 +160,6 @@ DRIVER_SOURCES = \
 	FX/fxtexman.c \
 	FX/fxtris.c \
 	FX/fxvb.c \
-	FX/fxsimplerender.c \
 	FX/fxglidew.c \
 	X/glxapi.c \
 	X/fakeglx.c \
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index d5ab089af1..f1b7698a92 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.37 2000/12/28 22:11:04 keithw Exp $
+# $Id: Makefile.X11,v 1.38 2001/01/05 05:31:42 keithw Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
@@ -160,7 +160,6 @@ DRIVER_SOURCES = \
 	FX/fxtexman.c \
 	FX/fxtris.c \
 	FX/fxvb.c \
-	FX/fxsimplerender.c \
 	FX/fxglidew.c \
 	X/glxapi.c \
 	X/fakeglx.c \
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 12eb9b791a..8624cb62e7 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.114 2000/12/26 05:09:28 keithw Exp $ */
+/* $Id: context.c,v 1.115 2001/01/05 05:31:42 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -59,7 +59,7 @@
 #include "math/m_vertices.h"
 #include "math/m_matrix.h"
 #include "math/m_xform.h"
-#include "math/math.h"
+#include "math/mathmod.h"
 #endif
 
 #if defined(MESA_TRACE)
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 5806f9c098..ca1cd5cf75 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1,4 +1,4 @@
-/* $Id: enable.c,v 1.38 2000/12/27 22:52:45 keithw Exp $ */
+/* $Id: enable.c,v 1.39 2001/01/05 05:31:42 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -85,6 +85,7 @@ client_state( GLcontext *ctx, GLenum cap, GLboolean state )
       break;
    default:
       gl_error( ctx, GL_INVALID_ENUM, "glEnable/DisableClientState" );
+      return;
    }
 
    if (*var == flag)
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 0050d9a1a1..6d9f3462b9 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,4 +1,4 @@
-/* $Id: varray.c,v 1.35 2000/12/28 22:11:05 keithw Exp $ */
+/* $Id: varray.c,v 1.36 2001/01/05 05:31:42 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -509,8 +509,8 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
    GLboolean tflag, cflag, nflag;  /* enable/disable flags */
    GLint tcomps, ccomps, vcomps;   /* components per texcoord, color, vertex */
 
-   GLenum ctype;                   /* color type */
-   GLint coffset, noffset, voffset;/* color, normal, vertex offsets */
+   GLenum ctype = 0;               /* color type */
+   GLint coffset = 0, noffset = 0, voffset;/* color, normal, vertex offsets */
    GLint defstride;                /* default stride */
    GLint c, f;
    GLint coordUnitSave;
diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c
index 0e04e7c8ab..856d0f56f2 100644
--- a/src/mesa/math/m_matrix.c
+++ b/src/mesa/math/m_matrix.c
@@ -1,4 +1,4 @@
-/* $Id: m_matrix.c,v 1.4 2000/11/24 10:25:11 keithw Exp $ */
+/* $Id: m_matrix.c,v 1.5 2001/01/05 05:31:42 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -34,6 +34,8 @@
  * 3. Transformation of a point p by a matrix M is: p' = M * p
  */
 
+#include <math.h>
+
 #include "glheader.h"
 #include "macros.h"
 #include "mem.h"
@@ -41,6 +43,7 @@
 
 #include "m_matrix.h"
 
+
 static const char *types[] = {
    "MATRIX_GENERAL",
    "MATRIX_IDENTITY",
diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h
index 046fc3d937..4024949257 100644
--- a/src/mesa/math/m_xform.h
+++ b/src/mesa/math/m_xform.h
@@ -1,4 +1,4 @@
-/* $Id: m_xform.h,v 1.3 2000/12/26 05:09:31 keithw Exp $ */
+/* $Id: m_xform.h,v 1.4 2001/01/05 05:31:42 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -34,7 +34,6 @@
 
 #include "glheader.h"
 #include "config.h"
-#include "math/math.h"
 #include "math/m_vector.h"
 #include "math/m_matrix.h"
 
diff --git a/src/mesa/math/mathmod.h b/src/mesa/math/mathmod.h
new file mode 100644
index 0000000000..35091a7aae
--- /dev/null
+++ b/src/mesa/math/mathmod.h
@@ -0,0 +1,8 @@
+#ifndef _MESA_MATH_H_
+#define _MESA_MATH_H_
+
+#include <math.h>
+
+extern void _math_init( void );
+
+#endif