diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-17 14:56:59 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-17 14:56:59 +0100 |
| commit | d7621cb4af1fda314f830e0e577e73b317f0a3ec (patch) | |
| tree | 47d58411927deb8685b919d085eff4000a094709 | |
| parent | 75b9da6e52d7ee39ae69c28cfb2e86bcf406a370 (diff) | |
| parent | 496844b1cd22bb5b4d404d1488c889e19d757d62 (diff) | |
| download | src-d7621cb4af1fda314f830e0e577e73b317f0a3ec.tar.gz | |
Merge from Chromium at DEPS revision r212014android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-dev
This commit was generated by merge_to_master.py.
Change-Id: I0866d379bff2b2c456cf4135e561956e36e2e8a8
| -rw-r--r-- | src/gallium/auxiliary/util/u_debug.h | 1 | ||||
| -rw-r--r-- | src/glsl/strtod.c | 2 |
2 files changed, 2 insertions, 1 deletions
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" 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); |