Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Unified Diff: src/gpu/GrAutoLocaleSetter.h

Issue 1162953003: Fix build for UCLIBC platforms (newlocale/freelocale) (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 7 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrAutoLocaleSetter.h
diff --git a/src/gpu/GrAutoLocaleSetter.h b/src/gpu/GrAutoLocaleSetter.h
index dd17bbef68637c6e5f35625beaac3ccb262d8bbf..3aa50c9d4d65c8bd59839222025d716bc898c769 100644
--- a/src/gpu/GrAutoLocaleSetter.h
+++ b/src/gpu/GrAutoLocaleSetter.h
@@ -28,7 +28,7 @@ public:
#if defined(SK_BUILD_FOR_WIN)
fOldPerThreadLocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
fOldLocale = setlocale(LC_ALL, name);
-#elif !defined(SK_BUILD_FOR_ANDROID)
+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
fLocale = newlocale(LC_ALL, name, 0);
if (fLocale) {
fOldLocale = uselocale(fLocale);
@@ -42,7 +42,7 @@ public:
#if defined(SK_BUILD_FOR_WIN)
setlocale(LC_ALL, fOldLocale);
_configthreadlocale(fOldPerThreadLocale);
-#elif !defined(SK_BUILD_FOR_ANDROID)
+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
if (fLocale) {
uselocale(fOldLocale);
freelocale(fLocale);
@@ -54,7 +54,7 @@ private:
#if defined(SK_BUILD_FOR_WIN)
int fOldPerThreadLocale;
const char* fOldLocale;
-#elif !defined(SK_BUILD_FOR_ANDROID)
+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
locale_t fOldLocale;
locale_t fLocale;
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698