diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-09-22 16:41:50 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-09-22 16:41:50 (GMT) |
| commit | 7c6aafa73dceaadb3f407c14720da652cba9a66e (patch) | |
| tree | 1e6472fd5b43f22f362b3a547d2959c0ca3cfee9 | |
| parent | ff4ac7d4b94fc2fbf5d86b32718eac81f223f03b (diff) | |
| download | tcl-7c6aafa73dceaadb3f407c14720da652cba9a66e.zip tcl-7c6aafa73dceaadb3f407c14720da652cba9a66e.tar.gz tcl-7c6aafa73dceaadb3f407c14720da652cba9a66e.tar.bz2 | |
Fix [https://core.tcl-lang.org/tk/tktview/832c2047bb|832c2047bb]: Windows: new compiler, new warnings..., Tcl part
| -rw-r--r-- | generic/tcl.h | 4 | ||||
| -rw-r--r-- | generic/tclPlatDecls.h | 2 | ||||
| -rw-r--r-- | generic/tclZipfs.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index e6f0f7f..a97bd11 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2382,7 +2382,7 @@ EXTERN void Tcl_StaticLibrary(Tcl_Interp *interp, #endif EXTERN Tcl_ExitProc * Tcl_SetExitProc(Tcl_ExitProc *proc); #ifdef _WIN32 -EXTERN const char *TclZipfs_AppHook(int *argc, wchar_t ***argv); +EXTERN const char *TclZipfs_AppHook(int *argc, unsigned short ***argv); #else EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv); #endif @@ -2391,7 +2391,7 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv); # define Tcl_FindExecutable(arg) ((Tcl_FindExecutable)((const char *)(arg))) #endif # define Tcl_MainEx Tcl_MainExW - EXTERN TCL_NORETURN void Tcl_MainExW(Tcl_Size argc, wchar_t **argv, + EXTERN TCL_NORETURN void Tcl_MainExW(Tcl_Size argc, unsigned short **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); #endif #if defined(USE_TCL_STUBS) && (TCL_MAJOR_VERSION > 8) diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index fb7f616..3f768e0 100644 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -33,7 +33,7 @@ */ #if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(_TCHAR_DEFINED) # if defined(_UNICODE) - typedef wchar_t TCHAR; + typedef unsigned short TCHAR; # else typedef char TCHAR; # endif diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 63efc14..cb7f2e1 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -6483,7 +6483,7 @@ TclZipfs_AppHook( TCL_UNUSED(int *), /*argcPtr*/ #endif #ifdef _WIN32 - TCL_UNUSED(WCHAR ***)) /* argvPtr */ + TCL_UNUSED(unsigned short ***)) /* argvPtr */ #else /* !_WIN32 */ char ***argvPtr) /* Pointer to argv */ #endif /* _WIN32 */ |