summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/main/imports.c6
-rw-r--r--src/mesa/main/imports.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 4123545..bb836dd 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1,4 +1,4 @@
-/* $Id: imports.c,v 1.28 2003/01/14 03:02:13 brianp Exp $ */
+/* $Id: imports.c,v 1.29 2003/01/14 03:05:38 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -379,12 +379,12 @@ _mesa_atoi(const char *s)
float
-_mesa_strtof( const char *s, const char **end )
+_mesa_strtof( const char *s, char **end )
{
#if defined(XFree86LOADER) && defined(IN_MODULE)
return xf86strtof(s, end);
#else
- return strtod(s, end);
+ return (float) strtod(s, end);
#endif
}
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 85834cb..405b499 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -1,4 +1,4 @@
-/* $Id: imports.h,v 1.10 2003/01/14 03:00:54 brianp Exp $ */
+/* $Id: imports.h,v 1.11 2003/01/14 03:05:38 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -174,7 +174,7 @@ extern int
_mesa_atoi( const char *s );
extern float
-_mesa_strtof( const char *s, const char **end );
+_mesa_strtof( const char *s, char **end );
extern int
_mesa_sprintf( char *str, const char *fmt, ... );