From 0d2c9a252e0f113a70842280d0ef7190a062fa89 Mon Sep 17 00:00:00 2001 From: Eric Karl Date: Mon, 17 Apr 2017 12:04:16 -0700 Subject: Pass LC_ALL_MASK to newlocale This change fixes an issue with GrAutoLocaleSetter, which was using the C library LC_ALL mask with newlocale. Instead the xlocale LC_ALL_MASK should be used (these do not match on all platforms). See: http://man7.org/linux/man-pages/man3/newlocale.3.html Bug: 711683 Change-Id: I6dba140e72b095f75667f0dcc98480d8d4562191 Reviewed-on: https://skia-review.googlesource.com/13601 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- src/gpu/GrAutoLocaleSetter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpu') diff --git a/src/gpu/GrAutoLocaleSetter.h b/src/gpu/GrAutoLocaleSetter.h index cec041e086..9cfa6374d4 100644 --- a/src/gpu/GrAutoLocaleSetter.h +++ b/src/gpu/GrAutoLocaleSetter.h @@ -54,7 +54,7 @@ public: name = nullptr; } #endif - fLocale = newlocale(LC_ALL, name, 0); + fLocale = newlocale(LC_ALL_MASK, name, 0); if (fLocale) { fOldLocale = uselocale(fLocale); } else { -- cgit v1.2.3