add some casts

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index bb836dd832756096a03e2b843f1a01299e18af86..9816936f1648fb49cdc404f5b8cc0b3d66de6604 100644 (file)
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1,4 +1,4 @@
-/* $Id: imports.c,v 1.29 2003/01/14 03:05:38 brianp Exp $ */
+/* $Id: imports.c,v 1.30 2003/01/19 15:27:38 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -360,7 +360,7 @@ char *
 _mesa_strdup( const char *s )
 {
    int l = _mesa_strlen(s);
-   char *s2 = _mesa_malloc(l + 1);
+   char *s2 = (char *) _mesa_malloc(l + 1);
    if (s2)
       _mesa_strcpy(s2, s);
    return s2;

diff --git a/src/mesa/main/nvfragparse.c b/src/mesa/main/nvfragparse.c
index c4035f00b1ab8b226b84af724689b302f3c4728d..641afa46d521ab707103d36c928a7a4b7db464ee 100644 (file)
--- a/src/mesa/main/nvfragparse.c
+++ b/src/mesa/main/nvfragparse.c
@@ -1,4 +1,4 @@
-/* $Id: nvfragparse.c,v 1.1 2003/01/14 04:55:46 brianp Exp $ */
+/* $Id: nvfragparse.c,v 1.2 2003/01/19 15:27:37 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -191,7 +191,7 @@ MatchInstruction(const char *token)
          return result;
       }
    }
-   result.opcode = -1;
+   result.opcode = (enum fp_opcode) -1;
    return result;
 }