From b039dbfffd8eedef53a5ff9ae6b0ae09e6844d9c Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 20 Aug 2014 14:40:23 +0800 Subject: configure: check for xlocale.h and strtof 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 Reviewed-by: Kenneth Graunke --- src/util/strtod.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/util/strtod.cpp b/src/util/strtod.cpp index 2f1d229..2a3e8eb 100644 --- a/src/util/strtod.cpp +++ b/src/util/strtod.cpp @@ -28,7 +28,7 @@ #ifdef _GNU_SOURCE #include -#ifdef __APPLE__ +#ifdef HAVE_XLOCALE_H #include #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); -- cgit v1.1