mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 17:41:12 +00:00
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
From 1c936d7fda3275265e37f93697232a1ed652390f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Will Dietz <w@wdtz.org>
|
||
|
|
Date: Sat, 9 Jul 2016 19:22:54 -0500
|
||
|
|
Subject: [PATCH] musl fixes/hacks
|
||
|
|
|
||
|
|
Conflicts:
|
||
|
|
|
||
|
|
include/__config
|
||
|
|
include/locale
|
||
|
|
src/locale.cpp
|
||
|
|
---
|
||
|
|
include/locale | 4 ++--
|
||
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/locale b/include/locale
|
||
|
|
index 3d804e8..9b01f5b 100644
|
||
|
|
--- a/include/locale
|
||
|
|
+++ b/include/locale
|
||
|
|
@@ -695,7 +695,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;
|
||
|
|
@@ -735,7 +735,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;
|
||
|
|
--
|
||
|
|
1.7.1
|
||
|
|
|