NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

configure: check for xlocale.h and strtof

Browse source 
With the assumptions that xlocale.h implies newlocale and strtof_l.  SCons is
updated to define HAVE_XLOCALE_H on linux and darwin.

Signed-off-by: Chia-I Wu <olv@lunarg.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Chia-I Wu 2014-08-20 14:40:23 +08:00 • committed by Kenneth Graunke
parent e3f2029479
commit b039dbfffd
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/util/strtod.cpp
View file

@ -28,7 +28,7 @@
#ifdef _GNU_SOURCE
#include <locale.h>
#ifdef __APPLE__
#ifdef HAVE_XLOCALE_H
#include <xlocale.h>
#endif
#endif
@ -44,9 +44,7 @@
double
_mesa_strtod(const char *s, char **end)
{
#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
!defined(ANDROID) && !defined(__HAIKU__) && !defined(__UCLIBC__) && \
!defined(__NetBSD__)
#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H)
static locale_t loc = NULL;
if (!loc) {
loc = newlocale(LC_CTYPE_MASK, "C", NULL);
@ -65,15 +63,13 @@ _mesa_strtod(const char *s, char **end)
float
_mesa_strtof(const char *s, char **end)
{
#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
!defined(ANDROID) && !defined(__HAIKU__) && !defined(__UCLIBC__) && \
!defined(__NetBSD__)
#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H)
static locale_t loc = NULL;
if (!loc) {
loc = newlocale(LC_CTYPE_MASK, "C", NULL);
}
return strtof_l(s, end, loc);
#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
#elif defined(HAVE_STRTOF)
return strtof(s, end);
#else
return (float) strtod(s, end);