From 346298c7658f2ec8b105e5e53101637af232724f Mon Sep 17 00:00:00 2001
From: Marcin Baczyński <marbacz@gmail.com>
Date: Sat, 13 Mar 2010 14:26:45 +0100
Subject: Replace _mesa_strtod with _mesa_strtof.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/main/imports.c | 12 +++++++-----
 src/mesa/main/imports.h |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 56e8195810..1ae0853364 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -795,18 +795,20 @@ _mesa_strdup( const char *s )
    }
 }
 
-/** Wrapper around strtod() */
-double
-_mesa_strtod( const char *s, char **end )
+/** Wrapper around strtof() */
+float
+_mesa_strtof( const char *s, char **end )
 {
 #ifdef _GNU_SOURCE
    static locale_t loc = NULL;
    if (!loc) {
       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
    }
-   return strtod_l(s, end, loc);
+   return strtof_l(s, end, loc);
+#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+   return strtof(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 fb4a00eca7..d28f4ad125 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -575,8 +575,8 @@ _mesa_getenv( const char *var );
 extern char *
 _mesa_strdup( const char *s );
 
-extern double
-_mesa_strtod( const char *s, char **end );
+extern float
+_mesa_strtof( const char *s, char **end );
 
 extern unsigned int
 _mesa_str_checksum(const char *str);
-- 
cgit v1.2.3


From f0c32629276a0bf33eed5ba519e3536061e239ad Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 16 Mar 2010 07:38:51 -0700
Subject: mesa: set version string to 7.8-rc1

---
 Makefile                | 2 +-
 src/mesa/main/version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/Makefile b/Makefile
index c4ee9e583c..37683e0f0d 100644
--- a/Makefile
+++ b/Makefile
@@ -180,7 +180,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.8-devel
+VERSION=7.8-rc1
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index d521569f8d..7ed1e1a32a 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -35,7 +35,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 8
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.8-devel"
+#define MESA_VERSION_STRING "7.8-rc1"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3