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

Unified Diff: src/gpu/GrAutoLocaleSetter.h

Issue 1526703003: Porting Skia for newlib compatibility. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years 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 | src/ports/SkTime_Unix.cpp » ('j') | src/ports/SkTime_Unix.cpp » ('J')
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 08196debf61ba30d9109add414e68253a732995f..d7a70cc2ce62d812343380cfab1540068faa4e53 100644
--- a/src/gpu/GrAutoLocaleSetter.h
+++ b/src/gpu/GrAutoLocaleSetter.h
@@ -38,7 +38,7 @@ public:
} else {
fShouldRestoreLocale = false;
}
-#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(_NEWLIB_VERSION)
Mark Seaborn 2015/12/15 00:27:03 This line is >80 chars. Can you wrap it, please?
Sean Klein 2015/12/15 01:05:51 Done.
fLocale = newlocale(LC_ALL, name, 0);
if (fLocale) {
fOldLocale = uselocale(fLocale);
@@ -56,7 +56,7 @@ public:
setlocale(LC_ALL, fOldLocale.c_str());
}
_configthreadlocale(fOldPerThreadLocale);
-#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(_NEWLIB_VERSION)
if (fLocale) {
uselocale(fOldLocale);
freelocale(fLocale);
@@ -69,7 +69,7 @@ private:
int fOldPerThreadLocale;
bool fShouldRestoreLocale;
SkString fOldLocale;
-#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(_NEWLIB_VERSION)
locale_t fOldLocale;
locale_t fLocale;
#endif
« no previous file with comments | « no previous file | src/ports/SkTime_Unix.cpp » ('j') | src/ports/SkTime_Unix.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698