diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2022-08-04 20:53:59 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2022-08-04 20:54:09 +0200 |
| commit | 7073ef4e8ff3c1024ca88d4ef8e5b17f4595b644 (patch) | |
| tree | b99cc0acda689d69767efa92789250f83cf5b90b | |
| parent | 7718cb70d48eec468a0b0cb815ed4f8461355eda (diff) | |
Cygwin: drop __stdcall usage
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/autoload.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/dcrt0.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/lib/cygwin_crt0.c | 2 | ||||
| -rw-r--r-- | winsup/cygwin/winsup.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc index ef0465d4e..cdf6e75de 100644 --- a/winsup/cygwin/autoload.cc +++ b/winsup/cygwin/autoload.cc @@ -382,10 +382,10 @@ wsock_init (struct func_info *func) if (!wsock_started) { - int __stdcall (*wsastartup) (int, WSADATA *); + int (*wsastartup) (int, WSADATA *); /* Don't use autoload to load WSAStartup to eliminate recursion. */ - wsastartup = (int __stdcall (*)(int, WSADATA *)) + wsastartup = (int (*)(int, WSADATA *)) GetProcAddress ((HMODULE) (dll->handle), "WSAStartup"); if (wsastartup) { diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 9162f84e7..263bcc1a4 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -1006,7 +1006,7 @@ __cygwin_exit_return: \n\ "); } -extern "C" void __stdcall +extern "C" void _dll_crt0 () { /* Starting with Windows 10 rel 1511, the main stack of an application is diff --git a/winsup/cygwin/lib/cygwin_crt0.c b/winsup/cygwin/lib/cygwin_crt0.c index 776e7e8de..7020a639d 100644 --- a/winsup/cygwin/lib/cygwin_crt0.c +++ b/winsup/cygwin/lib/cygwin_crt0.c @@ -9,7 +9,7 @@ details. */ #undef __INSIDE_CYGWIN__ #include "crt0.h" -extern void __stdcall _dll_crt0 () +extern void _dll_crt0 () __declspec (dllimport) __attribute__ ((noreturn)); /* for main module */ diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h index 4bcbfde64..43dfbf46f 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 __stdcall _dll_crt0 (); +extern "C" void _dll_crt0 (); void dll_crt0_1 (void *); void dll_dllcrt0_1 (void *); |