commit d7621cb4af1fda314f830e0e577e73b317f0a3ec
author Ben Murdoch <benm@google.com> Wed Jul 17 14:56:59 2013 +0100
committer Ben Murdoch <benm@google.com> Wed Jul 17 14:56:59 2013 +0100
tree 47d58411927deb8685b919d085eff4000a094709
parent 75b9da6e52d7ee39ae69c28cfb2e86bcf406a370
parent 496844b1cd22bb5b4d404d1488c889e19d757d62

Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: I0866d379bff2b2c456cf4135e561956e36e2e8a8

src/gallium/auxiliary/util/u_debug.h

diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
index 06470f6..583984f 100644
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -39,6 +39,7 @@
 #define U_DEBUG_H_
 
 
+#include <assert.h>
 #include "os/os_misc.h"
 
 

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);