summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/tclDate.c19
-rw-r--r--generic/tclGetDate.y3
-rw-r--r--generic/tclIcu.c6
-rw-r--r--generic/tclListObj.c6
-rw-r--r--generic/tclTest.c14
-rw-r--r--unix/tclSelectNotfy.c35
-rw-r--r--unix/tclUnixInit.c17
-rw-r--r--unix/tclUnixPort.h25
-rw-r--r--utf8proc/utf8proc.h3
9 files changed, 58 insertions, 70 deletions
diff --git a/generic/tclDate.c b/generic/tclDate.c
index 84824b6..0dfdb81 100644
--- a/generic/tclDate.c
+++ b/generic/tclDate.c
@@ -96,7 +96,8 @@
#ifdef _MSC_VER
#pragma warning( disable : 4102 )
-#elif defined (__clang__)
+#elif defined (__clang__) && (__clang_major__ > 14)
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#elif (__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
@@ -719,14 +720,14 @@ static const yytype_int8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_int16 yyrline[] =
{
- 0, 174, 174, 175, 179, 182, 185, 188, 192, 196,
- 199, 202, 206, 209, 214, 220, 226, 231, 235, 239,
- 243, 247, 251, 257, 258, 261, 265, 269, 273, 277,
- 281, 287, 293, 297, 302, 303, 308, 312, 317, 321,
- 326, 333, 337, 343, 343, 345, 350, 355, 357, 362,
- 364, 365, 373, 384, 399, 404, 407, 410, 413, 416,
- 419, 422, 427, 430, 435, 440, 445, 452, 455, 458,
- 463, 481, 484
+ 0, 175, 175, 176, 180, 183, 186, 189, 193, 197,
+ 200, 203, 207, 210, 215, 221, 227, 232, 236, 240,
+ 244, 248, 252, 258, 259, 262, 266, 270, 274, 278,
+ 282, 288, 294, 298, 303, 304, 309, 313, 318, 322,
+ 327, 334, 338, 344, 344, 346, 351, 356, 358, 363,
+ 365, 366, 374, 385, 400, 405, 408, 411, 414, 417,
+ 420, 423, 428, 431, 436, 441, 446, 453, 456, 459,
+ 464, 482, 485
};
#endif
diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y
index a86250f..2b71af4 100644
--- a/generic/tclGetDate.y
+++ b/generic/tclGetDate.y
@@ -45,7 +45,8 @@
#ifdef _MSC_VER
#pragma warning( disable : 4102 )
-#elif defined (__clang__)
+#elif defined (__clang__) && (__clang_major__ > 14)
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#elif (__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
diff --git a/generic/tclIcu.c b/generic/tclIcu.c
index 6e59b29..a8edbb9 100644
--- a/generic/tclIcu.c
+++ b/generic/tclIcu.c
@@ -1098,9 +1098,9 @@ IcuConverttoObjCmd(
Tcl_GetString(objv[objc-2]), strict, &dsOut) != TCL_OK) {
return TCL_ERROR;
}
- Tcl_SetObjResult(interp,
- Tcl_NewByteArrayObj((unsigned char *)Tcl_DStringValue(&dsOut),
- Tcl_DStringLength(&dsOut)));
+ Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(
+ (unsigned char *)Tcl_DStringValue(&dsOut),
+ Tcl_DStringLength(&dsOut)));
Tcl_DStringFree(&dsOut);
return TCL_OK;
}
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index cb60b00..67e8e03 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -503,9 +503,9 @@ TclListLimitExceededError(
* in Tcl_Size.
*/
if (interp != NULL) {
- Tcl_SetObjResult(interp,
- Tcl_ObjPrintf("max length (%" TCL_SIZE_MODIFIER
- "d) of a Tcl list exceeded", (Tcl_Size)LIST_MAX));
+ Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+ "max length (%" TCL_SIZE_MODIFIER "d) of a Tcl list exceeded",
+ (Tcl_Size)LIST_MAX));
Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
}
return TCL_ERROR;
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 703f39e..fce2b80 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -9160,8 +9160,7 @@ TestUtfToNormalizedCmd(
return TCL_ERROR;
}
if (len > slen) {
- Tcl_SetObjResult(interp,
- Tcl_ObjPrintf(
+ Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"Passed length %" TCL_SIZE_MODIFIER
"d is greater than string length %" TCL_SIZE_MODIFIER
"d.", len, slen));
@@ -9181,8 +9180,8 @@ TestUtfToNormalizedCmd(
(Tcl_UnicodeNormalizationForm)normForm, profile, bufPtr, bufLen, &bufStored);
if (result == TCL_OK) {
/* Return as raw bytes, not string */
- Tcl_SetObjResult(interp,
- Tcl_NewByteArrayObj((unsigned char *)bufPtr, bufStored));
+ Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(
+ (unsigned char *)bufPtr, bufStored));
}
if (bufPtr != buffer) {
Tcl_Free(bufPtr);
@@ -9238,8 +9237,7 @@ TestUtfToNormalizedDStringCmd(
return TCL_ERROR;
}
if (len > slen) {
- Tcl_SetObjResult(interp,
- Tcl_ObjPrintf(
+ Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"Passed length %" TCL_SIZE_MODIFIER
"d is greater than string length %" TCL_SIZE_MODIFIER
"d.", len, slen));
@@ -9252,8 +9250,8 @@ TestUtfToNormalizedDStringCmd(
(Tcl_UnicodeNormalizationForm)normForm, profile, &ds);
if (result == TCL_OK) {
/* Return as raw bytes, not string */
- Tcl_SetObjResult(interp,
- Tcl_NewByteArrayObj((unsigned char *)Tcl_DStringValue(&ds),
+ Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(
+ (unsigned char *)Tcl_DStringValue(&ds),
Tcl_DStringLength(&ds)));
Tcl_DStringFree(&ds);
}
diff --git a/unix/tclSelectNotfy.c b/unix/tclSelectNotfy.c
index 1b96ecf..c74364a 100644
--- a/unix/tclSelectNotfy.c
+++ b/unix/tclSelectNotfy.c
@@ -253,28 +253,25 @@ typedef struct {
const void *lpszClassName;
} WNDCLASSW;
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wignored-attributes"
-#endif
-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:
@@ -282,7 +279,7 @@ extern unsigned char __stdcall TranslateMessage(const MSG *);
#if TCL_THREADS && defined(__CYGWIN__)
static const wchar_t className[] = 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 && defined(__CYGWIN__) */
#ifdef __cplusplus
@@ -599,7 +596,7 @@ TclpDeleteFileHandler(
#if TCL_THREADS && defined(__CYGWIN__)
-static unsigned int __stdcall
+static unsigned int
NotifierProc(
void *hwnd,
unsigned int message,
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index ef62400..b4f5dbf 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -27,14 +27,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
@@ -860,8 +857,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/tclUnixPort.h b/unix/tclUnixPort.h
index fd62d7f..c4d89a7 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -89,25 +89,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 TclOSfstat(int fd, void *statBuf);
extern int TclOSstat(const char *name, void *statBuf);
diff --git a/utf8proc/utf8proc.h b/utf8proc/utf8proc.h
index 59e5389..86a9a27 100644
--- a/utf8proc/utf8proc.h
+++ b/utf8proc/utf8proc.h
@@ -209,7 +209,8 @@ typedef enum {
* Strip unassigned codepoints.
*/
UTF8PROC_STRIPNA = (1<<14),
-} utf8proc_option_t;
+} utf8proc_option_e;
+typedef int utf8proc_option_t;
/** @name Error codes
* Error codes being returned by almost all functions.
generated by cgit v0.12 at 2025-12-17 13:33:00 (GMT)