Define _strcmpi alias based on a new NO_STRCMPI_ALIAS macro. --- mingw-w64-crt/def-include/msvcrt-common.def.in | 8 ++++++++ mingw-w64-crt/lib-common/msvcr120_app.def.in | 3 +++ mingw-w64-crt/lib-common/msvcrt.def.in | 1 + mingw-w64-crt/lib-common/ucrtbase.def.in | 1 - mingw-w64-crt/lib32/crtdll.def.in | 1 + mingw-w64-crt/lib32/msvcr100.def.in | 1 - mingw-w64-crt/lib32/msvcr110.def.in | 1 - mingw-w64-crt/lib32/msvcr70.def.in | 1 + mingw-w64-crt/lib32/msvcr71.def.in | 1 + mingw-w64-crt/lib32/msvcr80.def.in | 1 - mingw-w64-crt/lib32/msvcr90.def.in | 1 - mingw-w64-crt/lib32/msvcr90d.def.in | 1 - mingw-w64-crt/lib32/msvcrt10.def.in | 1 + mingw-w64-crt/lib32/msvcrt20.def.in | 1 + mingw-w64-crt/lib32/msvcrt40.def.in | 1 + mingw-w64-crt/lib64/msvcr100.def.in | 1 - mingw-w64-crt/lib64/msvcr110.def.in | 1 - mingw-w64-crt/lib64/msvcr80.def.in | 1 - mingw-w64-crt/lib64/msvcr90.def.in | 1 - mingw-w64-crt/lib64/msvcr90d.def.in | 1 - 20 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/mingw-w64-crt/def-include/msvcrt-common.def.in b/mingw-w64-crt/def-include/msvcrt-common.def.in index 4285ec5d6dc0..6d91e760bfae 100644 --- a/mingw-w64-crt/def-include/msvcrt-common.def.in +++ b/mingw-w64-crt/def-include/msvcrt-common.def.in @@ -156,6 +156,14 @@ tzname DATA == _tzname ADD_UNDERSCORE(vsnprintf_s) #endif +; This is list of various symbol aliases which are needed for compatibility +; Some symbols in some version of CRT library were added and some other symbols were removed or renamed +; This list provides some level of backward and forward compatibility + +#ifndef NO_STRCMPI_ALIAS +_strcmpi == _stricmp +#endif + ; This is list of printf/scanf symbol aliases with __ms_ prefix #ifndef UCRTBASE __ms_fprintf == fprintf diff --git a/mingw-w64-crt/lib-common/msvcr120_app.def.in b/mingw-w64-crt/lib-common/msvcr120_app.def.in index 1c7c8bde4d75..1cc7548560fc 100644 --- a/mingw-w64-crt/lib-common/msvcr120_app.def.in +++ b/mingw-w64-crt/lib-common/msvcr120_app.def.in @@ -8,6 +8,9 @@ EXPORTS #include "func.def.in" #define NO_GETPID_ALIAS +#ifdef DEF_ARM32 +#define NO_STRCMPI_ALIAS +#endif #include "msvcrt-common.def.in" #ifdef DEF_X64 diff --git a/mingw-w64-crt/lib-common/msvcrt.def.in b/mingw-w64-crt/lib-common/msvcrt.def.in index 5085a136ef89..899a428be650 100644 --- a/mingw-w64-crt/lib-common/msvcrt.def.in +++ b/mingw-w64-crt/lib-common/msvcrt.def.in @@ -2,6 +2,7 @@ LIBRARY "msvcrt.dll" EXPORTS #define PRE_C95_SWPRINTF +#define NO_STRCMPI_ALIAS #include "func.def.in" #include "msvcrt-common.def.in" diff --git a/mingw-w64-crt/lib-common/ucrtbase.def.in b/mingw-w64-crt/lib-common/ucrtbase.def.in index 000861ee3889..2d0552f277ef 100644 --- a/mingw-w64-crt/lib-common/ucrtbase.def.in +++ b/mingw-w64-crt/lib-common/ucrtbase.def.in @@ -1944,7 +1944,6 @@ _stat64 _stat64i32 _statusfp F_I386(_statusfp2) -_strcmpi == _stricmp _strcoll_l _strdate _strdate_s diff --git a/mingw-w64-crt/lib32/crtdll.def.in b/mingw-w64-crt/lib32/crtdll.def.in index c4fe47ff05fc..e1093517af6b 100644 --- a/mingw-w64-crt/lib32/crtdll.def.in +++ b/mingw-w64-crt/lib32/crtdll.def.in @@ -68,6 +68,7 @@ LIBRARY "crtdll.dll" EXPORTS #define PRE_C95_SWPRINTF +#define NO_STRCMPI_ALIAS #include "msvcrt-common.def.in" ; crtdll.dll contains 3 mangled C++ symbols diff --git a/mingw-w64-crt/lib32/msvcr100.def.in b/mingw-w64-crt/lib32/msvcr100.def.in index cc1ff77aca9f..1c9e79a9b029 100644 --- a/mingw-w64-crt/lib32/msvcr100.def.in +++ b/mingw-w64-crt/lib32/msvcr100.def.in @@ -1381,7 +1381,6 @@ _strerror _strerror_s _strftime_l _stricmp -_strcmpi == _stricmp _stricmp_l _stricoll _stricoll_l diff --git a/mingw-w64-crt/lib32/msvcr110.def.in b/mingw-w64-crt/lib32/msvcr110.def.in index 477f22be24dc..a40be8f1c0f4 100644 --- a/mingw-w64-crt/lib32/msvcr110.def.in +++ b/mingw-w64-crt/lib32/msvcr110.def.in @@ -1514,7 +1514,6 @@ _strerror _strerror_s _strftime_l _stricmp -_strcmpi == _stricmp _stricmp_l _stricoll _stricoll_l diff --git a/mingw-w64-crt/lib32/msvcr70.def.in b/mingw-w64-crt/lib32/msvcr70.def.in index be830fa15dfe..49c4a6893577 100644 --- a/mingw-w64-crt/lib32/msvcr70.def.in +++ b/mingw-w64-crt/lib32/msvcr70.def.in @@ -7,6 +7,7 @@ LIBRARY "MSVCR70.dll" EXPORTS #define PRE_C95_SWPRINTF +#define NO_STRCMPI_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) diff --git a/mingw-w64-crt/lib32/msvcr71.def.in b/mingw-w64-crt/lib32/msvcr71.def.in index e1a7c9c3bf41..6b667725b86e 100644 --- a/mingw-w64-crt/lib32/msvcr71.def.in +++ b/mingw-w64-crt/lib32/msvcr71.def.in @@ -7,6 +7,7 @@ LIBRARY "MSVCR71.dll" EXPORTS #define PRE_C95_SWPRINTF +#define NO_STRCMPI_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in index c550e2bb1fa0..a26bbcf7c6dc 100644 --- a/mingw-w64-crt/lib32/msvcr80.def.in +++ b/mingw-w64-crt/lib32/msvcr80.def.in @@ -1022,7 +1022,6 @@ _strerror _strerror_s _strftime_l _stricmp -_strcmpi == _stricmp _stricmp_l _stricoll _stricoll_l diff --git a/mingw-w64-crt/lib32/msvcr90.def.in b/mingw-w64-crt/lib32/msvcr90.def.in index 1a2682e030ba..141abb0f13f8 100644 --- a/mingw-w64-crt/lib32/msvcr90.def.in +++ b/mingw-w64-crt/lib32/msvcr90.def.in @@ -1017,7 +1017,6 @@ _strerror _strerror_s _strftime_l _stricmp -_strcmpi == _stricmp _stricmp_l _stricoll _stricoll_l diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in b/mingw-w64-crt/lib32/msvcr90d.def.in index 35b5ce08765e..45673bc2f446 100644 --- a/mingw-w64-crt/lib32/msvcr90d.def.in +++ b/mingw-w64-crt/lib32/msvcr90d.def.in @@ -1082,7 +1082,6 @@ _strerror _strerror_s _strftime_l _stricmp -_strcmpi == _stricmp _stricmp_l _stricoll _stricoll_l diff --git a/mingw-w64-crt/lib32/msvcrt10.def.in b/mingw-w64-crt/lib32/msvcrt10.def.in index 3474977fc4f8..f9bde7373365 100644 --- a/mingw-w64-crt/lib32/msvcrt10.def.in +++ b/mingw-w64-crt/lib32/msvcrt10.def.in @@ -7,6 +7,7 @@ LIBRARY "MSVCRT10.dll" EXPORTS #define PRE_C95_SWPRINTF +#define NO_STRCMPI_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall Iostream_init::Iostream_init(class ios &,int) diff --git a/mingw-w64-crt/lib32/msvcrt20.def.in b/mingw-w64-crt/lib32/msvcrt20.def.in index 1230cd7deb59..1482dc846f6e 100644 --- a/mingw-w64-crt/lib32/msvcrt20.def.in +++ b/mingw-w64-crt/lib32/msvcrt20.def.in @@ -7,6 +7,7 @@ LIBRARY "MSVCRT20.dll" EXPORTS #define PRE_C95_SWPRINTF +#define NO_STRCMPI_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall Iostream_init::Iostream_init(class ios &,int) diff --git a/mingw-w64-crt/lib32/msvcrt40.def.in b/mingw-w64-crt/lib32/msvcrt40.def.in index c46eb3c00508..e24a70396c19 100644 --- a/mingw-w64-crt/lib32/msvcrt40.def.in +++ b/mingw-w64-crt/lib32/msvcrt40.def.in @@ -7,6 +7,7 @@ LIBRARY "MSVCRT40.dll" EXPORTS #define PRE_C95_SWPRINTF +#define NO_STRCMPI_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall Iostream_init::Iostream_init(class ios &,int) diff --git a/mingw-w64-crt/lib64/msvcr100.def.in b/mingw-w64-crt/lib64/msvcr100.def.in index eb0c551a8c6f..d848b442602d 100644 --- a/mingw-w64-crt/lib64/msvcr100.def.in +++ b/mingw-w64-crt/lib64/msvcr100.def.in @@ -1328,7 +1328,6 @@ _strerror _strerror_s _strftime_l _stricmp -_strcmpi == _stricmp _stricmp_l _stricoll _stricoll_l diff --git a/mingw-w64-crt/lib64/msvcr110.def.in b/mingw-w64-crt/lib64/msvcr110.def.in index fd4c7445b908..eacdb82d5705 100644 --- a/mingw-w64-crt/lib64/msvcr110.def.in +++ b/mingw-w64-crt/lib64/msvcr110.def.in @@ -1452,7 +1452,6 @@ _strerror _strerror_s _strftime_l _stricmp -_strcmpi == _stricmp _stricmp_l _stricoll _stricoll_l diff --git a/mingw-w64-crt/lib64/msvcr80.def.in b/mingw-w64-crt/lib64/msvcr80.def.in index a9663a90ae80..d88ad5dff250 100644 --- a/mingw-w64-crt/lib64/msvcr80.def.in +++ b/mingw-w64-crt/lib64/msvcr80.def.in @@ -952,7 +952,6 @@ _strerror _strerror_s _strftime_l _stricmp -_strcmpi == _stricmp _stricmp_l _stricoll _stricoll_l diff --git a/mingw-w64-crt/lib64/msvcr90.def.in b/mingw-w64-crt/lib64/msvcr90.def.in index 774b60cad55c..aef75760e013 100644 --- a/mingw-w64-crt/lib64/msvcr90.def.in +++ b/mingw-w64-crt/lib64/msvcr90.def.in @@ -950,7 +950,6 @@ _strerror _strerror_s _strftime_l _stricmp -_strcmpi == _stricmp _stricmp_l _stricoll _stricoll_l diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in b/mingw-w64-crt/lib64/msvcr90d.def.in index 74797db37116..9dbc4690ca47 100644 --- a/mingw-w64-crt/lib64/msvcr90d.def.in +++ b/mingw-w64-crt/lib64/msvcr90d.def.in @@ -1009,7 +1009,6 @@ _strerror _strerror_s _strftime_l _stricmp -_strcmpi == _stricmp _stricmp_l _stricoll _stricoll_l -- 2.20.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
