75 lines
2.8 KiB
Diff
75 lines
2.8 KiB
Diff
diff --git a/include/locale b/include/locale
|
|
index 2043892fa2d..6e5c285a7c9 100644
|
|
--- a/include/locale
|
|
+++ b/include/locale
|
|
@@ -737,7 +737,7 @@ __num_get_signed_integral(const char* __a, const char* __a_end,
|
|
typename remove_reference<decltype(errno)>::type __save_errno = errno;
|
|
errno = 0;
|
|
char *__p2;
|
|
- long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
|
|
+ long long __ll = strtoll(__a, &__p2, __base);
|
|
typename remove_reference<decltype(errno)>::type __current_errno = errno;
|
|
if (__current_errno == 0)
|
|
errno = __save_errno;
|
|
@@ -777,7 +777,7 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end,
|
|
typename remove_reference<decltype(errno)>::type __save_errno = errno;
|
|
errno = 0;
|
|
char *__p2;
|
|
- unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
|
|
+ unsigned long long __ll = strtoull(__a, &__p2, __base);
|
|
typename remove_reference<decltype(errno)>::type __current_errno = errno;
|
|
if (__current_errno == 0)
|
|
errno = __save_errno;
|
|
@@ -806,19 +806,19 @@ _Tp __do_strtod(const char* __a, char** __p2);
|
|
template <>
|
|
inline _LIBCPP_INLINE_VISIBILITY
|
|
float __do_strtod<float>(const char* __a, char** __p2) {
|
|
- return strtof_l(__a, __p2, _LIBCPP_GET_C_LOCALE);
|
|
+ return strtof(__a, __p2);
|
|
}
|
|
|
|
template <>
|
|
inline _LIBCPP_INLINE_VISIBILITY
|
|
double __do_strtod<double>(const char* __a, char** __p2) {
|
|
- return strtod_l(__a, __p2, _LIBCPP_GET_C_LOCALE);
|
|
+ return strtod(__a, __p2);
|
|
}
|
|
|
|
template <>
|
|
inline _LIBCPP_INLINE_VISIBILITY
|
|
long double __do_strtod<long double>(const char* __a, char** __p2) {
|
|
- return strtold_l(__a, __p2, _LIBCPP_GET_C_LOCALE);
|
|
+ return strtold(__a, __p2);
|
|
}
|
|
|
|
template <class _Tp>
|
|
@@ -1197,13 +1197,13 @@ __num_put<_CharT>::__widen_and_group_float(char* __nb, char* __np, char* __ne,
|
|
*__oe++ = __ct.widen(*__nf++);
|
|
*__oe++ = __ct.widen(*__nf++);
|
|
for (__ns = __nf; __ns < __ne; ++__ns)
|
|
- if (!isxdigit_l(*__ns, _LIBCPP_GET_C_LOCALE))
|
|
+ if (!isxdigit(*__ns))
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
for (__ns = __nf; __ns < __ne; ++__ns)
|
|
- if (!isdigit_l(*__ns, _LIBCPP_GET_C_LOCALE))
|
|
+ if (!isdigit(*__ns))
|
|
break;
|
|
}
|
|
if (__grouping.empty())
|
|
diff --git a/utils/google-benchmark/src/internal_macros.h b/utils/google-benchmark/src/internal_macros.h
|
|
index 5dbf4fd2752..4699c5ed913 100644
|
|
--- a/utils/google-benchmark/src/internal_macros.h
|
|
+++ b/utils/google-benchmark/src/internal_macros.h
|
|
@@ -70,6 +70,8 @@
|
|
#define BENCHMARK_OS_FUCHSIA 1
|
|
#elif defined (__SVR4) && defined (__sun)
|
|
#define BENCHMARK_OS_SOLARIS 1
|
|
+#elif defined(__GENODE__)
|
|
+ #define BENCHMARK_OS_GENODE 1
|
|
#endif
|
|
|
|
#if defined(__ANDROID__) && defined(__GLIBCXX__)
|