From a08c37d1bee2052c23586131b0c2da19bfffdf90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jerome.laban@nventive.com>
Date: Fri, 24 May 2019 15:24:00 -0400
Subject: [PATCH] Add missing strtod_l

---
 .../CalcManager.Android.vcxproj               |  1 +
 .../CalcManager.Android.vcxproj.filters       |  1 +
 src/CalcManager.Android/Source.cpp            | 23 +++++++++++++++++++
 src/CalcManager.Android/strto_workaround.cpp  | 21 +++++++++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 src/CalcManager.Android/Source.cpp
 create mode 100644 src/CalcManager.Android/strto_workaround.cpp

diff --git a/src/CalcManager.Android/CalcManager.Android.vcxproj b/src/CalcManager.Android/CalcManager.Android.vcxproj
index dd55a9db..aaaa423c 100644
--- a/src/CalcManager.Android/CalcManager.Android.vcxproj
+++ b/src/CalcManager.Android/CalcManager.Android.vcxproj
@@ -64,6 +64,7 @@
     <ClCompile Include="../CalcManager/Ratpack/support.cpp" />
     <ClCompile Include="../CalcManager/Ratpack/trans.cpp" />
     <ClCompile Include="../CalcManager/Ratpack/transh.cpp" />
+    <ClCompile Include="strto_workaround.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../CalcManager/CalculatorHistory.h" />
diff --git a/src/CalcManager.Android/CalcManager.Android.vcxproj.filters b/src/CalcManager.Android/CalcManager.Android.vcxproj.filters
index fba4455c..40dcf476 100644
--- a/src/CalcManager.Android/CalcManager.Android.vcxproj.filters
+++ b/src/CalcManager.Android/CalcManager.Android.vcxproj.filters
@@ -41,6 +41,7 @@
     <ClCompile Include="../CalcManager/Ratpack/support.cpp" />
     <ClCompile Include="../CalcManager/Ratpack/trans.cpp" />
     <ClCompile Include="../CalcManager/Ratpack/transh.cpp" />
+    <ClCompile Include="strto_workaround.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../CalcManager/CalculatorHistory.h" />
diff --git a/src/CalcManager.Android/Source.cpp b/src/CalcManager.Android/Source.cpp
new file mode 100644
index 00000000..ce079f01
--- /dev/null
+++ b/src/CalcManager.Android/Source.cpp
@@ -0,0 +1,23 @@
+#include <locale.h>
+
+// see https://github.com/aosp-mirror/platform_bionic/commit/3103f6d39e4ae309a9374ee38f414400c889c558#diff-71865bddb52592934317bb2340a94b0cR199
+
+double strtod_l(const char* s, char** end_ptr, locale_t)
+{
+    return strtod(s, end_ptr);
+}
+
+float strtof_l(const char* s, char** end_ptr, locale_t)
+{
+    return strtof(s, end_ptr);
+}
+
+long strtol_l(const char* s, char** end_ptr, int base, locale_t)
+{
+    return strtol(s, end_ptr, base);
+}
+
+unsigned long strtoul_l(const char* s, char** end_ptr, int base, locale_t)
+{
+    return strtoul(s, end_ptr, base);
+}
diff --git a/src/CalcManager.Android/strto_workaround.cpp b/src/CalcManager.Android/strto_workaround.cpp
new file mode 100644
index 00000000..1e927c84
--- /dev/null
+++ b/src/CalcManager.Android/strto_workaround.cpp
@@ -0,0 +1,21 @@
+#include <locale.h>
+
+double strtod_l(const char* s, char** end_ptr, locale_t)
+{
+    return strtod(s, end_ptr);
+}
+
+float strtof_l(const char* s, char** end_ptr, locale_t)
+{
+    return strtof(s, end_ptr);
+}
+
+long strtol_l(const char* s, char** end_ptr, int base, locale_t)
+{
+    return strtol(s, end_ptr, base);
+}
+
+unsigned long strtoul_l(const char* s, char** end_ptr, int base, locale_t)
+{
+    return strtoul(s, end_ptr, base);
+}