Index: third_party/mesa/MesaLib/src/mesa/main/imports.c |
diff --git a/third_party/mesa/MesaLib/src/mesa/main/imports.c b/third_party/mesa/MesaLib/src/mesa/main/imports.c |
index 46e5c932d0f5d2cc2db995232e47bb0a3c52fa95..2cbb09ddef5f7aed10d5870e7ef33a2c0363f245 100644 |
--- a/third_party/mesa/MesaLib/src/mesa/main/imports.c |
+++ b/third_party/mesa/MesaLib/src/mesa/main/imports.c |
@@ -756,7 +756,8 @@ _mesa_strdup( const char *s ) |
float |
_mesa_strtof( const char *s, char **end ) |
{ |
-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) |
+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ |
+ !defined(ANDROID) |
static locale_t loc = NULL; |
if (!loc) { |
loc = newlocale(LC_CTYPE_MASK, "C", NULL); |