These two symbols _NLG_Dispatch2 and _NLG_Return are available only in
32-bit x86 crt dll libraries, starting in msvcr80.dll.

msvc import library msvcrt.lib from the beginning since Visual C++ 2005
contains these symbols without stdcall decoration.

So for compatibility with msvc, do not decorate these symbols with @SIZE
suffix (the suffix used for stdcall) in all def files.
---
 mingw-w64-crt/lib-common/api-ms-win-crt-private-l1-1-0.def.in | 4 ++--
 mingw-w64-crt/lib-common/msvcr120_app.def.in                  | 4 ++--
 mingw-w64-crt/lib-common/ucrtbase-common.def.in               | 4 ++--
 mingw-w64-crt/lib-common/vcruntime140-common.def.in           | 4 ++--
 mingw-w64-crt/lib32/msvcr100.def.in                           | 4 ++--
 mingw-w64-crt/lib32/msvcr100d.def.in                          | 4 ++--
 mingw-w64-crt/lib32/msvcr110.def.in                           | 4 ++--
 mingw-w64-crt/lib32/msvcr110d.def.in                          | 4 ++--
 mingw-w64-crt/lib32/msvcr120.def.in                           | 4 ++--
 mingw-w64-crt/lib32/msvcr120d.def.in                          | 4 ++--
 mingw-w64-crt/lib32/msvcr80.def.in                            | 4 ++--
 mingw-w64-crt/lib32/msvcr80d.def.in                           | 4 ++--
 mingw-w64-crt/lib32/msvcr90.def.in                            | 4 ++--
 mingw-w64-crt/lib32/msvcr90d.def.in                           | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/mingw-w64-crt/lib-common/api-ms-win-crt-private-l1-1-0.def.in 
b/mingw-w64-crt/lib-common/api-ms-win-crt-private-l1-1-0.def.in
index ce9ff54afd3f..8aaebcc3d874 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-crt-private-l1-1-0.def.in
+++ b/mingw-w64-crt/lib-common/api-ms-win-crt-private-l1-1-0.def.in
@@ -12,8 +12,8 @@ _FindAndUnlinkFrame
 F_X64(_GetImageBase)
 F_X64(_GetThrowImageBase)
 _IsExceptionObjectToBeDestroyed
-F_I386(_NLG_Dispatch2@4)
-F_I386(_NLG_Return@12)
+F_I386(_NLG_Dispatch2) ; msvc symbol is without decoration but callee pop 
stack (like stdcall @4)
+F_I386(_NLG_Return) ; msvc symbol is without decoration but callee pop stack 
(like stdcall @12)
 F_I386(_NLG_Return2)
 F_X64(_SetImageBase)
 F_X64(_SetThrowImageBase)
diff --git a/mingw-w64-crt/lib-common/msvcr120_app.def.in 
b/mingw-w64-crt/lib-common/msvcr120_app.def.in
index 42c64240b389..620b586747e4 100644
--- a/mingw-w64-crt/lib-common/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib-common/msvcr120_app.def.in
@@ -1040,8 +1040,8 @@ __CxxUnregisterExceptionObject
 __DestructExceptionObject
 __FrameUnwindFilter
 __GetPlatformExceptionInfo
-F_I386(_NLG_Dispatch2@4)
-F_I386(_NLG_Return@12)
+F_I386(_NLG_Dispatch2) ; msvc symbol is without decoration but callee pop 
stack (like stdcall @4)
+F_I386(_NLG_Return) ; msvc symbol is without decoration but callee pop stack 
(like stdcall @12)
 F_NON_I386(__NLG_Dispatch2)
 F_I386(_NLG_Return2)
 F_NON_I386(__NLG_Return2)
diff --git a/mingw-w64-crt/lib-common/ucrtbase-common.def.in 
b/mingw-w64-crt/lib-common/ucrtbase-common.def.in
index 90a099306df9..764ef606106b 100644
--- a/mingw-w64-crt/lib-common/ucrtbase-common.def.in
+++ b/mingw-w64-crt/lib-common/ucrtbase-common.def.in
@@ -75,8 +75,8 @@ _IsExceptionObjectToBeDestroyed
 _LCbuild
 _LCmulcc
 _LCmulcr
-F_I386(_NLG_Dispatch2@4)
-F_I386(_NLG_Return@12)
+F_I386(_NLG_Dispatch2) ; msvc symbol is without decoration but callee pop 
stack (like stdcall @4)
+F_I386(_NLG_Return) ; msvc symbol is without decoration but callee pop stack 
(like stdcall @12)
 F_I386(_NLG_Return2)
 F_X64(_SetImageBase)
 F_X64(_SetThrowImageBase)
diff --git a/mingw-w64-crt/lib-common/vcruntime140-common.def.in 
b/mingw-w64-crt/lib-common/vcruntime140-common.def.in
index 6dc643f70635..4a94a783e198 100644
--- a/mingw-w64-crt/lib-common/vcruntime140-common.def.in
+++ b/mingw-w64-crt/lib-common/vcruntime140-common.def.in
@@ -4,8 +4,8 @@ F_NON_I386(_CxxThrowException)
 F_I386(_EH_prolog)
 _FindAndUnlinkFrame
 _IsExceptionObjectToBeDestroyed
-F_I386(_NLG_Dispatch2@4)
-F_I386(_NLG_Return@12)
+F_I386(_NLG_Dispatch2) ; msvc symbol is without decoration but callee pop 
stack (like stdcall @4)
+F_I386(_NLG_Return) ; msvc symbol is without decoration but callee pop stack 
(like stdcall @12)
 F_I386(_NLG_Return2)
 _SetWinRTOutOfMemoryExceptionCallback
 __AdjustPointer
diff --git a/mingw-w64-crt/lib32/msvcr100.def.in 
b/mingw-w64-crt/lib32/msvcr100.def.in
index b1d73dfb83a5..429892fc9605 100644
--- a/mingw-w64-crt/lib32/msvcr100.def.in
+++ b/mingw-w64-crt/lib32/msvcr100.def.in
@@ -574,8 +574,8 @@ _Getmonths
 _Gettnames
 _HUGE DATA
 _IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like 
stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like 
stdcall @12)
 _NLG_Return2
 _Strftime
 _XcptFilter
diff --git a/mingw-w64-crt/lib32/msvcr100d.def.in 
b/mingw-w64-crt/lib32/msvcr100d.def.in
index 0ec23175a0a8..0b4be1098262 100644
--- a/mingw-w64-crt/lib32/msvcr100d.def.in
+++ b/mingw-w64-crt/lib32/msvcr100d.def.in
@@ -608,8 +608,8 @@ _Getmonths
 _Gettnames
 _HUGE DATA
 _IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like 
stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like 
stdcall @12)
 _NLG_Return2
 _Strftime
 _VCrtDbgReportA
diff --git a/mingw-w64-crt/lib32/msvcr110.def.in 
b/mingw-w64-crt/lib32/msvcr110.def.in
index dee3662b17d6..02419abe65da 100644
--- a/mingw-w64-crt/lib32/msvcr110.def.in
+++ b/mingw-w64-crt/lib32/msvcr110.def.in
@@ -695,8 +695,8 @@ _Gettnames
 _HUGE DATA
 _IsExceptionObjectToBeDestroyed
 _Lock_shared_ptr_spin_lock
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like 
stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like 
stdcall @12)
 _NLG_Return2
 _Strftime
 _Unlock_shared_ptr_spin_lock
diff --git a/mingw-w64-crt/lib32/msvcr110d.def.in 
b/mingw-w64-crt/lib32/msvcr110d.def.in
index 7719fbd32461..b75c3dfc3185 100644
--- a/mingw-w64-crt/lib32/msvcr110d.def.in
+++ b/mingw-w64-crt/lib32/msvcr110d.def.in
@@ -729,8 +729,8 @@ _Gettnames
 _HUGE DATA
 _IsExceptionObjectToBeDestroyed
 _Lock_shared_ptr_spin_lock
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like 
stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like 
stdcall @12)
 _NLG_Return2
 _Strftime
 _Unlock_shared_ptr_spin_lock
diff --git a/mingw-w64-crt/lib32/msvcr120.def.in 
b/mingw-w64-crt/lib32/msvcr120.def.in
index 2432346e8ce7..748889f70624 100644
--- a/mingw-w64-crt/lib32/msvcr120.def.in
+++ b/mingw-w64-crt/lib32/msvcr120.def.in
@@ -684,8 +684,8 @@ _Gettnames
 _HUGE DATA
 _IsExceptionObjectToBeDestroyed
 _LCbuild
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like 
stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like 
stdcall @12)
 _NLG_Return2
 _SetWinRTOutOfMemoryExceptionCallback
 _Strftime
diff --git a/mingw-w64-crt/lib32/msvcr120d.def.in 
b/mingw-w64-crt/lib32/msvcr120d.def.in
index a5db5161247c..343a5dc8d35d 100644
--- a/mingw-w64-crt/lib32/msvcr120d.def.in
+++ b/mingw-w64-crt/lib32/msvcr120d.def.in
@@ -718,8 +718,8 @@ _Gettnames
 _HUGE DATA
 _IsExceptionObjectToBeDestroyed
 _LCbuild
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like 
stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like 
stdcall @12)
 _NLG_Return2
 _SetWinRTOutOfMemoryExceptionCallback
 _Strftime
diff --git a/mingw-w64-crt/lib32/msvcr80.def.in 
b/mingw-w64-crt/lib32/msvcr80.def.in
index 9b1b5d1a04e0..47619d603568 100644
--- a/mingw-w64-crt/lib32/msvcr80.def.in
+++ b/mingw-w64-crt/lib32/msvcr80.def.in
@@ -174,8 +174,8 @@ _Getmonths
 _Gettnames
 _HUGE DATA
 _IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like 
stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like 
stdcall @12)
 _NLG_Return2
 _Strftime
 _XcptFilter
diff --git a/mingw-w64-crt/lib32/msvcr80d.def.in 
b/mingw-w64-crt/lib32/msvcr80d.def.in
index 1931dc3ae7ab..470bdcde0022 100644
--- a/mingw-w64-crt/lib32/msvcr80d.def.in
+++ b/mingw-w64-crt/lib32/msvcr80d.def.in
@@ -221,8 +221,8 @@ _Getmonths
 _Gettnames
 _HUGE DATA
 _IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like 
stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like 
stdcall @12)
 _NLG_Return2
 _Strftime
 _VCrtDbgReportA
diff --git a/mingw-w64-crt/lib32/msvcr90.def.in 
b/mingw-w64-crt/lib32/msvcr90.def.in
index 697b928181c6..5f704ba791cd 100644
--- a/mingw-w64-crt/lib32/msvcr90.def.in
+++ b/mingw-w64-crt/lib32/msvcr90.def.in
@@ -176,8 +176,8 @@ _Getmonths
 _Gettnames
 _HUGE DATA
 _IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like 
stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like 
stdcall @12)
 _NLG_Return2
 _Strftime
 _XcptFilter
diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in 
b/mingw-w64-crt/lib32/msvcr90d.def.in
index f1da7b68804d..5bbdc5b526c6 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def.in
+++ b/mingw-w64-crt/lib32/msvcr90d.def.in
@@ -214,8 +214,8 @@ _Getmonths
 _Gettnames
 _HUGE DATA
 _IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like 
stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like 
stdcall @12)
 _NLG_Return2
 _Strftime
 _VCrtDbgReportA
-- 
2.20.1



_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to