Signed-off-by: Martin Storsjö <[email protected]>
---
mingw-w64-crt/crt/charmax.c | 2 +-
mingw-w64-crt/crt/crtexe.c | 12 ++++++------
mingw-w64-crt/crt/tlssup.c | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/mingw-w64-crt/crt/charmax.c b/mingw-w64-crt/crt/charmax.c
index 08aa5a1d3..5106d1e0d 100644
--- a/mingw-w64-crt/crt/charmax.c
+++ b/mingw-w64-crt/crt/charmax.c
@@ -10,7 +10,7 @@
__declspec(dllimport) int __lconv_init (void);
-int mingw_initcharmax = 0;
+int __mingw_initcharmax = 0;
int _charmax = 255;
diff --git a/mingw-w64-crt/crt/crtexe.c b/mingw-w64-crt/crt/crtexe.c
index 4c7830f01..a7af136fe 100644
--- a/mingw-w64-crt/crt/crtexe.c
+++ b/mingw-w64-crt/crt/crtexe.c
@@ -329,9 +329,9 @@ __tmainCRTStartup (void)
return mainret;
}
-extern int mingw_initltsdrot_force;
-extern int mingw_initltsdyn_force;
-extern int mingw_initltssuo_force;
+extern int __mingw_initltsdrot_force;
+extern int __mingw_initltsdyn_force;
+extern int __mingw_initltssuo_force;
static int __cdecl
check_managed_app (void)
@@ -342,9 +342,9 @@ check_managed_app (void)
PIMAGE_OPTIONAL_HEADER64 pNTHeader64;
/* Force to be linked. */
- mingw_initltsdrot_force=1;
- mingw_initltsdyn_force=1;
- mingw_initltssuo_force=1;
+ __mingw_initltsdrot_force=1;
+ __mingw_initltsdyn_force=1;
+ __mingw_initltssuo_force=1;
pDOSHeader = (PIMAGE_DOS_HEADER) &__ImageBase;
if (pDOSHeader->e_magic != IMAGE_DOS_SIGNATURE)
diff --git a/mingw-w64-crt/crt/tlssup.c b/mingw-w64-crt/crt/tlssup.c
index 582fa8519..47beb27fc 100644
--- a/mingw-w64-crt/crt/tlssup.c
+++ b/mingw-w64-crt/crt/tlssup.c
@@ -170,6 +170,6 @@ __dyn_tls_dtor (HANDLE hDllHandle, DWORD dwReason, LPVOID
lpreserved)
_CRTALLOC(".CRT$XLD") PIMAGE_TLS_CALLBACK __xl_d = (PIMAGE_TLS_CALLBACK)
__dyn_tls_dtor;
-int mingw_initltsdrot_force = 0;
-int mingw_initltsdyn_force = 0;
-int mingw_initltssuo_force = 0;
+int __mingw_initltsdrot_force = 0;
+int __mingw_initltsdyn_force = 0;
+int __mingw_initltssuo_force = 0;
--
2.25.1
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
