commit 2a3406721cd61852bebd502c7a907cf07b7be731
author mymax@amazon.com <mymax@amazon.com@0039d316-1c4b-4281-b951-d872f2087c98> Thu Jul 04 02:30:29 2013
committer mymax@amazon.com <mymax@amazon.com@0039d316-1c4b-4281-b951-d872f2087c98> Thu Jul 04 02:30:29 2013
tree 47d58411927deb8685b919d085eff4000a094709
parent 99703ab948d16a83979d70d595e48cc5a0f06880

Don't use strtod_l in Mesa on Android

Android includes a fix to asm/posix_types.h inside
/ndk/toolchains/x86-4.7/prebuilt/linux-x86_64/lib/gcc/
i686-linux-android/4.7/include-fixed/asm/posix_types.h. That
file #include_next's the real asm/posix_types.h, but then fixes
(redefines) the __FD_ZERO macro. However, it also #includes
features.h, which unconditionally defines _GNU_SOURCE.
src/glsl/strtod.c assumes that if the _GNU_SOURCE macro is defined,
that it can use locale_t, which isn't available on Android.

Review URL: https://chromiumcodereview.appspot.com/18594002

git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@210110 0039d316-1c4b-4281-b951-d872f2087c98

src/glsl/strtod.c

diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
index 47c1f0e..e34bc9a 100644
--- a/src/glsl/strtod.c
+++ b/src/glsl/strtod.c
@@ -45,7 +45,7 @@
 glsl_strtod(const char *s, char **end)
 {
 #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
-   !defined(__HAIKU__) && !defined(__UCLIBC__)
+   !defined(__HAIKU__) && !defined(__UCLIBC__) && !defined(ANDROID)
    static locale_t loc = NULL;
    if (!loc) {
       loc = newlocale(LC_CTYPE_MASK, "C", NULL);