These are pretty untested in practice, but as this is what the headers require based on e.g. _USE_32BIT_TIME_T, we need to provide matching aliases on arm and arm64 as well.
Signed-off-by: Martin Storsjö <mar...@martin.st> --- mingw-w64-crt/def-include/func.def.in | 6 +++++ mingw-w64-crt/lib-common/msvcrt.def.in | 40 +++++++++++++++++----------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/mingw-w64-crt/def-include/func.def.in b/mingw-w64-crt/def-include/func.def.in index fff7be7..58cc36d 100644 --- a/mingw-w64-crt/def-include/func.def.in +++ b/mingw-w64-crt/def-include/func.def.in @@ -1,3 +1,4 @@ +// F32 - function available on all 32 bit architectures // F64 - function available on all 64 bit architectures // F_X86_ANY - function available on i386 and x86_64 // F_I386 - function available only on i386 @@ -12,9 +13,11 @@ #define F_X86_ANY(x) x #define F_NON_I386(x) x #elif defined(DEF_I386) +#define F32(x) x #define F_I386(x) x #define F_X86_ANY(x) x #elif defined(DEF_ARM32) +#define F32(x) x #define F_ARM32(x) x #define F_ARM_ANY(x) x #define F_NON_I386(x) x @@ -25,6 +28,9 @@ #define F_NON_I386(x) x #endif +#ifndef F32 +#define F32(x) +#endif #ifndef F64 #define F64(x) #endif diff --git a/mingw-w64-crt/lib-common/msvcrt.def.in b/mingw-w64-crt/lib-common/msvcrt.def.in index 6a7d6ad..2359beb 100644 --- a/mingw-w64-crt/lib-common/msvcrt.def.in +++ b/mingw-w64-crt/lib-common/msvcrt.def.in @@ -492,17 +492,17 @@ _filelengthi64 _fileno _findclose _findfirst -F_I386(_findfirst32 == _findfirst) +F32(_findfirst32 == _findfirst) _findfirst64 _findfirsti64 -F_I386(_findfirst32i64 == _findfirsti64) -F_X64(_findfirst64i32 == _findfirst) +F32(_findfirst32i64 == _findfirsti64) +F64(_findfirst64i32 == _findfirst) _findnext -F_I386(_findnext32 == _findnext) +F32(_findnext32 == _findnext) _findnext64 _findnexti64 -F_I386(_findnext32i64 == _findnexti64) -F_X64(_findnext64i32 == _findnext) +F32(_findnext32i64 == _findnexti64) +F64(_findnext64i32 == _findnext) _finite F_NON_I386(_finitef) _flsbuf @@ -527,17 +527,17 @@ F_NON_I386(_fscanf_s_l) F_ARM_ANY(_fseeki64) _fsopen _fstat -F_I386(_fstat32 == _fstat) +F32(_fstat32 == _fstat) _fstat64 _fstati64 -F_X64(_fstat64i32 == _fstat) +F64(_fstat64i32 == _fstat) _ftime F_ARM_ANY(_ftime32) _ftime32_s _ftime64 _ftime64_s -F_I386(_ftime_s == _ftime32_s) -F_X64(_ftime_s == _ftime64_s) +F32(_ftime_s == _ftime32_s) +F64(_ftime_s == _ftime64_s) F_I386(_ftol) _fullpath F_ARM_ANY(_fullpath_dbg) @@ -993,8 +993,8 @@ _sscanf_s_l _stat _stat64 _stati64 -F_I386(_stat32 == _stat) -F_X64(_stat64i32 == _stat) +F32(_stat32 == _stat) +F64(_stat64i32 == _stat) _statusfp _strcmpi _strcoll_l @@ -1202,17 +1202,17 @@ _wexecvp _wexecvpe _wfdopen _wfindfirst -F_I386(_wfindfirst32 == _wfindfirst) +F32(_wfindfirst32 == _wfindfirst) _wfindfirst64 _wfindfirsti64 -F_I386(_wfindfirst32i64 == _wfindfirsti64) -F_X64(_wfindfirst64i32 == _wfindfirst) +F32(_wfindfirst32i64 == _wfindfirsti64) +F64(_wfindfirst64i32 == _wfindfirst) _wfindnext -F_I386(_wfindnext32 == _wfindnext) +F32(_wfindnext32 == _wfindnext) _wfindnext64 _wfindnexti64 -F_I386(_wfindnext32i64 == _wfindnexti64) -F_X64(_wfindnext64i32 == _wfindnext) +F32(_wfindnext32i64 == _wfindnexti64) +F64(_wfindnext64i32 == _wfindnext) _wfopen _wfopen_s _wfreopen @@ -1268,8 +1268,8 @@ _wsplitpath_s _wstat _wstat64 _wstati64 -F_I386(_wstat32 == _wstat) -F_X64(_wstat64i32 == _wstat) +F32(_wstat32 == _wstat) +F64(_wstat64i32 == _wstat) _wstrdate ; _wstrdate_s replaced by emu _wstrtime -- 2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
