Skip to content

Commit f2b5753

Browse files
author
jan.nijtmans
committed
Fix [https://core.tcl-lang.org/tk/tktview/832c2047bb|832c2047bb]: Windows: new compiler, new warnings..., Tcl part
2 parents e0f5ee3 + 7c6aafa commit f2b5753

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

generic/tcl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2297,7 +2297,7 @@ EXTERN void Tcl_StaticLibrary(Tcl_Interp *interp,
22972297
#endif
22982298
EXTERN Tcl_ExitProc * Tcl_SetExitProc(Tcl_ExitProc *proc);
22992299
#ifdef _WIN32
2300-
EXTERN const char *TclZipfs_AppHook(int *argc, wchar_t ***argv);
2300+
EXTERN const char *TclZipfs_AppHook(int *argc, unsigned short ***argv);
23012301
#else
23022302
EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
23032303
#endif
@@ -2306,7 +2306,7 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
23062306
# define Tcl_FindExecutable(arg) ((Tcl_FindExecutable)((const char *)(arg)))
23072307
#endif
23082308
# define Tcl_MainEx Tcl_MainExW
2309-
EXTERN TCL_NORETURN void Tcl_MainExW(Tcl_Size argc, wchar_t **argv,
2309+
EXTERN TCL_NORETURN void Tcl_MainExW(Tcl_Size argc, unsigned short **argv,
23102310
Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
23112311
#endif
23122312
#if defined(USE_TCL_STUBS)

generic/tclPlatDecls.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*/
3434
#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(_TCHAR_DEFINED)
3535
# if defined(_UNICODE)
36-
typedef wchar_t TCHAR;
36+
typedef unsigned short TCHAR;
3737
# else
3838
typedef char TCHAR;
3939
# endif

generic/tclZipfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6456,7 +6456,7 @@ TclZipfs_AppHook(
64566456
TCL_UNUSED(int *), /*argcPtr*/
64576457
#endif
64586458
#ifdef _WIN32
6459-
TCL_UNUSED(WCHAR ***)) /* argvPtr */
6459+
TCL_UNUSED(unsigned short ***)) /* argvPtr */
64606460
#else /* !_WIN32 */
64616461
char ***argvPtr) /* Pointer to argv */
64626462
#endif /* _WIN32 */

0 commit comments

Comments
 (0)