diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-12-05 15:35:05 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-12-05 15:35:05 (GMT) |
| commit | ba427c0bc26dec201b4bfe86861b2e68b99bd91e (patch) | |
| tree | b866eb6e3676117d2de2eaaa1ce1bdd0ab6ffa21 | |
| parent | b58aa65f02ba9134bf4ba2c2a0b7b73e99cf8559 (diff) | |
| parent | b1af92a6e9b1b3d5beb88352a5d8f610cb7bf0e0 (diff) | |
| download | tcl-ba427c0bc26dec201b4bfe86861b2e68b99bd91e.zip tcl-ba427c0bc26dec201b4bfe86861b2e68b99bd91e.tar.gz tcl-ba427c0bc26dec201b4bfe86861b2e68b99bd91e.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tcl.h | 16 | ||||
| -rw-r--r-- | generic/tclTomMath.h | 2 |
2 files changed, 5 insertions, 13 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index c28f421..1f3e3a5 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -318,9 +318,7 @@ typedef int Tcl_Size; #endif #ifdef _WIN32 -# if TCL_MAJOR_VERSION > 8 - typedef struct __stat64 Tcl_StatBuf; -# elif defined(_WIN64) || defined(_USE_64BIT_TIME_T) +# 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; @@ -329,26 +327,20 @@ typedef int Tcl_Size; # endif #elif defined(__CYGWIN__) typedef struct { - dev_t st_dev; + unsigned st_dev; unsigned short st_ino; unsigned short st_mode; short st_nlink; short st_uid; short st_gid; /* Here is a 2-byte gap */ - dev_t st_rdev; + unsigned st_rdev; /* Here is a 4-byte gap */ - long long st_size; -#if TCL_MAJOR_VERSION > 8 - struct {long long tv_sec;} st_atim; - struct {long long tv_sec;} st_mtim; - struct {long long tv_sec;} st_ctim; -#else + long st_size; struct {long tv_sec;} st_atim; struct {long tv_sec;} st_mtim; struct {long tv_sec;} st_ctim; /* Here is a 4-byte gap */ -#endif } Tcl_StatBuf; #elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__) typedef struct stat64 Tcl_StatBuf; diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h index b421cde..40a4e9d 100644 --- a/generic/tclTomMath.h +++ b/generic/tclTomMath.h @@ -4,7 +4,7 @@ #ifdef MP_NO_STDINT # ifdef HAVE_STDINT_H # include <stdint.h> -#else +# else # include "../compat/stdint.h" # endif #endif |