From 13d49cff5e749a393d9f04dd098e83567786a124 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 16 Sep 2025 19:17:09 +0000 Subject: Eliminate __stdcall usage: cygwin32 is no longer supported --- unix/tclUnixInit.c | 17 +++++++---------- unix/tclUnixNotfy.c | 32 ++++++++++++++++---------------- unix/tclUnixPort.h | 25 +++++++++---------------- 3 files changed, 32 insertions(+), 42 deletions(-) diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index c7b2efe..c7de6a8 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -36,14 +36,11 @@ #ifdef __cplusplus extern "C" { #endif -#ifdef __clang__ -#pragma clang diagnostic ignored "-Wignored-attributes" -#endif -DLLIMPORT extern __stdcall unsigned char GetVersionExW(void *); -DLLIMPORT extern __stdcall void *GetModuleHandleW(const void *); -DLLIMPORT extern __stdcall void FreeLibrary(void *); -DLLIMPORT extern __stdcall void *GetProcAddress(void *, const char *); -DLLIMPORT extern __stdcall void GetSystemInfo(void *); +DLLIMPORT extern unsigned char GetVersionExW(void *); +DLLIMPORT extern void *GetModuleHandleW(const void *); +DLLIMPORT extern void FreeLibrary(void *); +DLLIMPORT extern void *GetProcAddress(void *, const char *); +DLLIMPORT extern void GetSystemInfo(void *); #ifdef __cplusplus } #endif @@ -877,8 +874,8 @@ TclpSetVariables( unameOK = 1; if (!osInfoInitialized) { void *handle = GetModuleHandleW(L"NTDLL"); - int(__stdcall *getversion)(void *) = - (int(__stdcall *)(void *))GetProcAddress(handle, "RtlGetVersion"); + int(*getversion)(void *) = + (int(*)(void *))GetProcAddress(handle, "RtlGetVersion"); osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); if (!getversion || getversion(&osInfo)) { GetVersionExW(&osInfo); diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c index 0bee2f1..1d0b6b0 100644 --- a/unix/tclUnixNotfy.c +++ b/unix/tclUnixNotfy.c @@ -236,31 +236,31 @@ typedef struct { const void *lpszClassName; } WNDCLASSW; -extern void __stdcall CloseHandle(void *); -extern void *__stdcall CreateEventW(void *, unsigned char, unsigned char, +extern void CloseHandle(void *); +extern void * CreateEventW(void *, unsigned char, unsigned char, void *); -extern void * __stdcall CreateWindowExW(void *, const void *, const void *, +extern void * CreateWindowExW(void *, const void *, const void *, unsigned int, int, int, int, int, void *, void *, void *, void *); -extern unsigned int __stdcall DefWindowProcW(void *, int, void *, void *); -extern unsigned char __stdcall DestroyWindow(void *); -extern int __stdcall DispatchMessageW(const MSG *); -extern unsigned char __stdcall GetMessageW(MSG *, void *, int, int); -extern void __stdcall MsgWaitForMultipleObjects(unsigned int, void *, +extern unsigned int DefWindowProcW(void *, int, void *, void *); +extern unsigned char DestroyWindow(void *); +extern int DispatchMessageW(const MSG *); +extern unsigned char GetMessageW(MSG *, void *, int, int); +extern void MsgWaitForMultipleObjects(unsigned int, void *, unsigned char, unsigned int, unsigned int); -extern unsigned char __stdcall PeekMessageW(MSG *, void *, int, int, int); -extern unsigned char __stdcall PostMessageW(void *, unsigned int, void *, +extern unsigned char PeekMessageW(MSG *, void *, int, int, int); +extern unsigned char PostMessageW(void *, unsigned int, void *, void *); -extern void __stdcall PostQuitMessage(int); -extern void *__stdcall RegisterClassW(const WNDCLASSW *); -extern unsigned char __stdcall ResetEvent(void *); -extern unsigned char __stdcall TranslateMessage(const MSG *); +extern void PostQuitMessage(int); +extern void * RegisterClassW(const WNDCLASSW *); +extern unsigned char ResetEvent(void *); +extern unsigned char TranslateMessage(const MSG *); /* * Threaded-cygwin specific constants and functions in this file: */ static const wchar_t *NotfyClassName = L"TclNotifier"; -static unsigned int __stdcall NotifierProc(void *hwnd, unsigned int message, +static unsigned int NotifierProc(void *hwnd, unsigned int message, void *wParam, void *lParam); #endif /* TCL_THREADS && __CYGWIN__ */ @@ -814,7 +814,7 @@ FileHandlerEventProc( #if defined(TCL_THREADS) && defined(__CYGWIN__) -static unsigned int __stdcall +static unsigned int NotifierProc( void *hwnd, unsigned int message, diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 486fa23..4ca461c 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -98,25 +98,18 @@ extern "C" { # define SOCKET unsigned int # define WSAEWOULDBLOCK 10035 typedef unsigned short WCHAR; -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wignored-attributes" -#endif - __declspec(dllimport) extern __stdcall int GetModuleHandleExW(unsigned int, const void *, void *); - __declspec(dllimport) extern __stdcall int GetModuleFileNameW(void *, const void *, int); - __declspec(dllimport) extern __stdcall int WideCharToMultiByte(int, int, const void *, int, + __declspec(dllimport) extern int GetModuleHandleExW(unsigned int, const void *, void *); + __declspec(dllimport) extern int GetModuleFileNameW(void *, const void *, int); + __declspec(dllimport) extern int WideCharToMultiByte(int, int, const void *, int, char *, int, const char *, void *); - __declspec(dllimport) extern __stdcall int MultiByteToWideChar(int, int, const char *, int, + __declspec(dllimport) extern int MultiByteToWideChar(int, int, const char *, int, WCHAR *, int); - __declspec(dllimport) extern __stdcall void OutputDebugStringW(const WCHAR *); - __declspec(dllimport) extern __stdcall int IsDebuggerPresent(void); - __declspec(dllimport) extern __stdcall int GetLastError(void); - __declspec(dllimport) extern __stdcall int GetFileAttributesW(const WCHAR *); - __declspec(dllimport) extern __stdcall int SetFileAttributesW(const WCHAR *, int); + __declspec(dllimport) extern void OutputDebugStringW(const WCHAR *); + __declspec(dllimport) extern int IsDebuggerPresent(void); + __declspec(dllimport) extern int GetLastError(void); + __declspec(dllimport) extern int GetFileAttributesW(const WCHAR *); + __declspec(dllimport) extern int SetFileAttributesW(const WCHAR *, int); __declspec(dllimport) extern int cygwin_conv_path(int, const void *, void *, int); -#ifdef __clang__ -#pragma clang diagnostic pop -#endif # define timezone _timezone extern int TclOSstat(const char *name, void *statBuf); extern int TclOSlstat(const char *name, void *statBuf); -- cgit v0.12