For msvcrt.dll, the actual function is named without a -32 suffix
but the suffixed version is provided as an alias in the import
library. For msvcr*.dll and ucrtbase.dll, the actual function is
named with the -32 suffix and the unsuffixed version is an alias.
(The alias is missing in ucrtbase.dll.)

TL;DR, this makes the msvcr*.dll/ucrtbase.dll behaviour the default
and makes the old msvcrt.dll the exception (using the alias).

Signed-off-by: Martin Storsjö <mar...@martin.st>
---
 mingw-w64-headers/crt/io.h    | 8 ++++----
 mingw-w64-headers/crt/wchar.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mingw-w64-headers/crt/io.h b/mingw-w64-headers/crt/io.h
index 92ad977..a7cc5fc 100644
--- a/mingw-w64-headers/crt/io.h
+++ b/mingw-w64-headers/crt/io.h
@@ -72,8 +72,8 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
 #define _finddata_t _finddata32_t
 #define _finddatai64_t _finddata32i64_t
 
-#define _findfirst32 _findfirst
-#define _findnext32 _findnext
+#define _findfirst _findfirst32
+#define _findnext _findnext32
 #define _findfirsti64 _findfirst32i64
 #define _findnexti64 _findnext32i64
 #else
@@ -131,8 +131,8 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
 #define _wfinddata_t _wfinddata32_t
 #define _wfinddatai64_t _wfinddata32i64_t
 
-#define _wfindfirst32 _wfindfirst
-#define _wfindnext32 _wfindnext
+#define _wfindfirst _wfindfirst32
+#define _wfindnext _wfindnext32
 #define _wfindfirst32i64 _wfindfirsti64
 #define _wfindnext32i64 _wfindnexti64
 #else
diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h
index 77fc734..61c0a41 100644
--- a/mingw-w64-headers/crt/wchar.h
+++ b/mingw-w64-headers/crt/wchar.h
@@ -124,8 +124,8 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to 
an array of FILE */
 #define _wfinddata_t _wfinddata32_t
 #define _wfinddatai64_t _wfinddata32i64_t
 
-#define _wfindfirst32 _wfindfirst
-#define _wfindnext32 _wfindnext
+#define _wfindfirst _wfindfirst32
+#define _wfindnext _wfindnext32
 #define _wfindfirst32i64 _wfindfirsti64
 #define _wfindnext32i64 _wfindnexti64
 #else
-- 
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

Reply via email to