From 07cf7630957e637755b347888bc4d69e5d51aa71 Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Tue, 7 Jun 2022 13:46:31 -0400 Subject: [PATCH] Cygwin: restore two instances of __stdcall In the previous commit, __stdcall was removed from _dll_crt0 in winsup.h and dcrt0.cc but not in lib/cygwin_crt0.c. For consistency, restore the first two occurrences of __stdcall. We could instead remove it from the declaration in lib/cygwin_crt0.c, but this might appear to affect binary compatibility, even though it really doesn't. --- winsup/cygwin/dcrt0.cc | 2 +- winsup/cygwin/winsup.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index c460e15a0..a8ed8e2fe 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -1013,7 +1013,7 @@ __cygwin_exit_return: \n\ "); } -extern "C" void +extern "C" void __stdcall _dll_crt0 () { /* Starting with Windows 10 rel 1511, the main stack of an application is diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h index 43dfbf46f..4bcbfde64 100644 --- a/winsup/cygwin/winsup.h +++ b/winsup/cygwin/winsup.h @@ -147,7 +147,7 @@ extern int cygserver_running; class per_process; /* cygwin .dll initialization */ void dll_crt0 (per_process *) __asm__ (_SYMSTR (dll_crt0__FP11per_process)); -extern "C" void _dll_crt0 (); +extern "C" void __stdcall _dll_crt0 (); void dll_crt0_1 (void *); void dll_dllcrt0_1 (void *);