[PATCH 0/1] MR1101: include: Move strto[iu]max(_l) from stdlib.h to inttypes.h.

[Alex Henrie (＠alexhenrie)]

Needed to compile PuTTY.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1101

[PATCH 1/1] include: Move strto[iu]max(_l) from stdlib.h to inttypes.h.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

Needed to compile PuTTY.
---
 include/msvcrt/inttypes.h | 5 +++++
 include/msvcrt/stdlib.h   | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/msvcrt/inttypes.h b/include/msvcrt/inttypes.h
index dd30bc97c85..d6ad4868d05 100644
--- a/include/msvcrt/inttypes.h
+++ b/include/msvcrt/inttypes.h
@@ -234,6 +234,11 @@ typedef struct {
 #define SCNuPTR "u"
 #endif
 
+_ACRTIMP __int64            __cdecl strtoimax(const char*,char**,int);
+_ACRTIMP __int64            __cdecl strtoimax_l(const char*,char**,int,_locale_t);
+_ACRTIMP unsigned __int64   __cdecl strtoumax(const char*,char**,int);
+_ACRTIMP unsigned __int64   __cdecl strtoumax_l(const char*,char**,int,_locale_t);
+
 #ifdef	__cplusplus
 }
 #endif
diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h
index f7acdda73cb..a6e1c7eee02 100644
--- a/include/msvcrt/stdlib.h
+++ b/include/msvcrt/stdlib.h
@@ -229,10 +229,6 @@ _ACRTIMP __msvcrt_long __cdecl strtol(const char*,char**,int);
 _ACRTIMP __msvcrt_ulong __cdecl strtoul(const char*,char**,int);
 _ACRTIMP __int64       __cdecl _strtoll_l(const char*,char**,int,_locale_t);
 _ACRTIMP unsigned __int64 __cdecl _strtoull_l(const char*,char**,int,_locale_t);
-_ACRTIMP __int64       __cdecl strtoimax(const char*,char**,int);
-_ACRTIMP __int64       __cdecl strtoimax_l(const char*,char**,int,_locale_t);
-_ACRTIMP unsigned __int64 __cdecl strtoumax(const char*,char**,int);
-_ACRTIMP unsigned __int64 __cdecl strtoumax_l(const char*,char**,int,_locale_t);
 _ACRTIMP __int64       __cdecl _strtoi64(const char*,char**,int);
 _ACRTIMP __int64       __cdecl _strtoi64_l(const char*,char**,int,_locale_t);
 _ACRTIMP unsigned __int64 __cdecl _strtoui64(const char*,char**,int);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1101

[PATCH 1/1] include: Move strto[iu]max(_l) from stdlib.h to inttypes.h.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=125118

Your paranoid android.


=== debian11 (32 bit report) ===

d3d9:
device.c:3603: Test failed: Failed to create a D3D object.

ddraw:
ddraw7.c:15663: Test failed: Expected unsynchronised map for flags 0x1000.
ddraw7.c:15663: Test failed: Expected unsynchronised map for flags 0x3000.

=== debian11 (build log) ===

Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24779.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24779.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24779.

[PATCH 0/1] MR1101: include: Move strto[iu]max(_l) from stdlib.h to inttypes.h. - approved

[Piotr Caban (＠piotr)]

This merge request was approved by Piotr Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1101