summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/main/imports.c4
-rw-r--r--src/mesa/main/nvfragparse.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index bb836dd832..9816936f16 100644
--- 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 c4035f00b1..641afa46d5 100644
--- 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;
}