diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-07-04 22:59:35 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-07-04 22:59:35 +0000 |
| commit | 496844b1cd22bb5b4d404d1488c889e19d757d62 (patch) | |
| tree | 47d58411927deb8685b919d085eff4000a094709 | |
| parent | f5e6465011653cc6301c44072cb095b45a1eb788 (diff) | |
| parent | 2a3406721cd61852bebd502c7a907cf07b7be731 (diff) | |
| download | src-496844b1cd22bb5b4d404d1488c889e19d757d62.tar.gz | |
Merge third_party/mesa/src from https://chromium.googlesource.com/chromium/deps/mesa.git at 2a3406721cd61852bebd502c7a907cf07b7be731
This commit was generated by merge_from_chromium.py.
Change-Id: Ida738bc5247e9b01dba5ad3be523c4a4eb1e6ddf
| -rw-r--r-- | src/glsl/strtod.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ double 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); |