diff options
| author | mymax@amazon.com <mymax@amazon.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-04 22:41:40 +0000 |
|---|---|---|
| committer | mymax@amazon.com <mymax@amazon.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-04 22:41:40 +0000 |
| commit | 7dc6315d1c0f8d3d230526f58d79212b07bdbbe7 (patch) | |
| tree | 62f0330e0286d60dd1c98c3a847e81c794b28563 /third_party | |
| parent | d4a2d26892d6af13e1a7ef0620b93ddc63cb32c2 (diff) | |
| download | chromium_src-7dc6315d1c0f8d3d230526f58d79212b07bdbbe7.zip chromium_src-7dc6315d1c0f8d3d230526f58d79212b07bdbbe7.tar.gz chromium_src-7dc6315d1c0f8d3d230526f58d79212b07bdbbe7.tar.bz2 | |
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.
BUG=238755
R=kbr@chromium.org, senorblanco@chromium.org, marcheu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18582004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/mesa/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/mesa/mesa.gyp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium index 3ba4bb0..d6d8b93 100644 --- a/third_party/mesa/README.chromium +++ b/third_party/mesa/README.chromium @@ -30,5 +30,8 @@ Modifications made: - Added typedefs for EGLNative*Type in eglplatform.h, guarded by an __APPLE__ define +- Modified glsl_strtod in src/glsl/strtod.c to use strtod instead of + strtod_l on Android + - Added an #include for <assert.h> at the top of src/gallium/auxiliary/util/u_debug.h diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index da76a4e..1b7b61a 100644 --- a/third_party/mesa/mesa.gyp +++ b/third_party/mesa/mesa.gyp @@ -50,6 +50,7 @@ ['OS=="android"', { 'defines': [ '__GLIBC__', + '_GNU_SOURCE', ], }], ['OS=="linux"', { |