third_party/mesa/MesaLib/src/mesa/main/imports.c - Issue 10825442: Fix the compile errors for mesa on Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/mesa/MesaLib/src/mesa/main/imports.c

Issue 10825442: Fix the compile errors for mesa on Android (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

« no previous file with comments | « third_party/mesa/MesaLib/src/mesa/main/imports.h ('k') | third_party/mesa/README.chromium » ('j') | no next file with comments »