Porting Skia for newlib compatibility.

src/gpu/GrAutoLocaleSetter.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrAutoLocaleSetter_DEFINED
 #define GrAutoLocaleSetter_DEFINED
 
 #include "GrTypes.h"
 
 #if defined(SK_BUILD_FOR_WIN)
 #include "SkString.h"
 #endif
 
 #if !defined(SK_BUILD_FOR_ANDROID)
 #include <locale.h>
 #endif
 
 #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
 #include <xlocale.h>
 #endif
 
+#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || \

[mtklein, 2015/12/15 13:42:58]

Skia typically wraps at column 100, so I bet this'll all fit on one line?

[Sean Klein, 2015/12/15 17:20:26]

Done.

+    defined(_NEWLIB_VERSION)
+#define HAVE_LOCALE_T 0

[mtklein, 2015/12/15 13:42:58]

We tend to indent inside #if blocks, but for something this short it doesn't
matter much.

[Sean Klein, 2015/12/15 17:20:26]

Acknowledged.

+#else
+#define HAVE_LOCALE_T 1
+#endif
+
 /**
  * Helper class for ensuring that we don't use the wrong locale when building shaders. Android
  * doesn't support locale in the NDK, so this is a no-op there.
  */
 class GrAutoLocaleSetter : public SkNoncopyable {
 public:
     GrAutoLocaleSetter (const char* name) {
 #if defined(SK_BUILD_FOR_WIN)
         fOldPerThreadLocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);        
         char* oldLocale = setlocale(LC_ALL, name);
         if (oldLocale) {
             fOldLocale = oldLocale;
             fShouldRestoreLocale = true;
         } else {
             fShouldRestoreLocale = false;
         }
-#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
+#elif HAVE_LOCALE_T
         fLocale = newlocale(LC_ALL, name, 0);
         if (fLocale) {
             fOldLocale = uselocale(fLocale);
         } else {
             fOldLocale = static_cast<locale_t>(0);
         }
 #else
         (void) name; // suppress unused param warning.
 #endif
     }
 
     ~GrAutoLocaleSetter () {
 #if defined(SK_BUILD_FOR_WIN)
         if (fShouldRestoreLocale) {
             setlocale(LC_ALL, fOldLocale.c_str());
         }
         _configthreadlocale(fOldPerThreadLocale);
-#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
+#elif HAVE_LOCALE_T
         if (fLocale) {
              uselocale(fOldLocale);
              freelocale(fLocale);
         }
 #endif
     }
 
 private:
 #if defined(SK_BUILD_FOR_WIN)
     int fOldPerThreadLocale;
     bool fShouldRestoreLocale;
     SkString fOldLocale;
-#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
+#elif HAVE_LOCALE_T
     locale_t fOldLocale;
     locale_t fLocale;
 #endif

[mtklein, 2015/12/15 13:42:58]

Given that this is a header, let's #undef HAVE_LOCALE_T down here for hygiene?

[Sean Klein, 2015/12/15 17:20:26]

Done.

 };
 
 #endif