diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-04-12 08:58:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-04-12 08:58:03 (GMT) |
| commit | 9c0541d0e4b22e9f9e12d754ba7c9bb1c430a0a8 (patch) | |
| tree | 818f8cedb9721cc821eef0a3436ce1d6625885a6 | |
| parent | 3643909840952b5e4dc9edd9d1fec509c43d2c08 (diff) | |
| parent | bee240eab0a1a75644337eccaa0c17001330f72a (diff) | |
| download | tcl-9c0541d0e4b22e9f9e12d754ba7c9bb1c430a0a8.zip tcl-9c0541d0e4b22e9f9e12d754ba7c9bb1c430a0a8.tar.gz tcl-9c0541d0e4b22e9f9e12d754ba7c9bb1c430a0a8.tar.bz2 | |
Fix [0b9200888e]: TIP #660 breaks TIP #628/#630
| -rw-r--r-- | generic/tcl.h | 10 | ||||
| -rw-r--r-- | unix/dltest/pkgt.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 6dacbd9..4460b6e 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -334,12 +334,12 @@ typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt; # if TCL_MAJOR_VERSION > 8 || defined(_WIN64) || defined(_USE_64BIT_TIME_T) typedef struct __stat64 Tcl_StatBuf; # elif defined(_USE_32BIT_TIME_T) - typedef struct _stati64 Tcl_StatBuf; + typedef struct _stati64 Tcl_StatBuf; # else typedef struct _stat32i64 Tcl_StatBuf; # endif #elif defined(__CYGWIN__) - typedef struct { + typedef struct { unsigned st_dev; unsigned short st_ino; unsigned short st_mode; @@ -568,7 +568,7 @@ typedef int (Tcl_CmdObjTraceProc) (void *clientData, Tcl_Interp *interp, int level, const char *command, Tcl_Command commandInfo, int objc, struct Tcl_Obj *const *objv); typedef int (Tcl_CmdObjTraceProc2) (void *clientData, Tcl_Interp *interp, - Tcl_Size level, const char *command, Tcl_Command commandInfo, Tcl_Size objc, + ptrdiff_t level, const char *command, Tcl_Command commandInfo, ptrdiff_t objc, struct Tcl_Obj *const *objv); typedef void (Tcl_CmdObjTraceDeleteProc) (void *clientData); typedef void (Tcl_DupInternalRepProc) (struct Tcl_Obj *srcPtr, @@ -593,7 +593,7 @@ typedef void (Tcl_NamespaceDeleteProc) (void *clientData); typedef int (Tcl_ObjCmdProc) (void *clientData, Tcl_Interp *interp, int objc, struct Tcl_Obj *const *objv); typedef int (Tcl_ObjCmdProc2) (void *clientData, Tcl_Interp *interp, - Tcl_Size objc, struct Tcl_Obj *const *objv); + ptrdiff_t objc, struct Tcl_Obj *const *objv); typedef int (Tcl_LibraryInitProc) (Tcl_Interp *interp); typedef int (Tcl_LibraryUnloadProc) (Tcl_Interp *interp, int flags); typedef void (Tcl_PanicProc) (const char *format, ...); @@ -2346,7 +2346,7 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv); #define TclZipfs_AppHook(argcp, argvp) \ TclInitStubTable(((const char *(*)(int *, void *))TclStubCall((void *)3))(argcp, argvp)) #define Tcl_MainExW(argc, argv, appInitProc, interp) \ - (void)((const char *(*)(size_t, const void *, Tcl_AppInitProc *, Tcl_Interp *)) \ + (void)((const char *(*)(Tcl_Size, const void *, Tcl_AppInitProc *, Tcl_Interp *)) \ TclStubCall((void *)4))(argc, argv, appInitProc, interp) #if !defined(_WIN32) || !defined(UNICODE) #define Tcl_MainEx(argc, argv, appInitProc, interp) \ diff --git a/unix/dltest/pkgt.c b/unix/dltest/pkgt.c index 1f326f5..77e21ac 100644 --- a/unix/dltest/pkgt.c +++ b/unix/dltest/pkgt.c @@ -16,10 +16,10 @@ static int TraceProc2 ( void *clientData, Tcl_Interp *interp, - Tcl_Size level, + ptrdiff_t level, const char *command, Tcl_Command commandInfo, - Tcl_Size objc, + ptrdiff_t objc, struct Tcl_Obj *const *objv) { (void)clientData; @@ -55,12 +55,12 @@ static int Pkgt_EqObjCmd2( void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ - Tcl_Size objc, /* Number of arguments. */ + ptrdiff_t objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { Tcl_WideInt result; const char *str1, *str2; - Tcl_Size len1, len2; + ptrdiff_t len1, len2; (void)dummy; if (objc != 3) { |