diff options
Diffstat (limited to 'gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.h')
| -rw-r--r-- | gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.h b/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.h index aedb13ffe..028c18570 100644 --- a/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.h +++ b/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.h @@ -59,13 +59,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { char* __old = std::setlocale(LC_NUMERIC, 0); char* __sav = 0; - if (__old && __builtin_strcmp(__old, "C")) - { - const size_t __len = __builtin_strlen(__old) + 1; - __sav = new char[__len]; - __builtin_memcpy(__sav, __old, __len); - std::setlocale(LC_NUMERIC, "C"); +#if defined (__ANDROID__) + if (__old) + { +#endif + if (__builtin_strcmp(__old, "C")) + { + const size_t __len = __builtin_strlen(__old) + 1; + __sav = new char[__len]; + __builtin_memcpy(__sav, __old, __len); + std::setlocale(LC_NUMERIC, "C"); + } +#if defined (__ANDROID__) } +#endif __builtin_va_list __args; __builtin_va_start(__args, __fmt); |