diff options
| author | dgp <dgp@users.sourceforge.net> | 2021-01-08 21:07:57 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2021-01-08 21:07:57 (GMT) |
| commit | 8229cd730444707ecef238b9678a5c8d779554f0 (patch) | |
| tree | 28dbb787f28e59d75da785125db09451de89b1ff /generic/tclIORChan.c | |
| parent | db51032d33e94c96859a874ec838558620720a09 (diff) | |
| parent | 4e3cd053dbb7487dfdf2e93f5151d9bdd5f9865e (diff) | |
| download | tcl-8229cd730444707ecef238b9678a5c8d779554f0.zip tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.gz tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.bz2 | |
Merge 8.7 (resolve conflicts)
Diffstat (limited to 'generic/tclIORChan.c')
| -rw-r--r-- | generic/tclIORChan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c index b96033d..5bcd88b 100644 --- a/generic/tclIORChan.c +++ b/generic/tclIORChan.c @@ -44,8 +44,8 @@ static void ReflectThread(ClientData clientData, int action); static int ReflectEventRun(Tcl_Event *ev, int flags); static int ReflectEventDelete(Tcl_Event *ev, ClientData cd); #endif -static Tcl_WideInt ReflectSeekWide(ClientData clientData, - Tcl_WideInt offset, int mode, int *errorCodePtr); +static long long ReflectSeekWide(ClientData clientData, + long long offset, int mode, int *errorCodePtr); static int ReflectGetOption(ClientData clientData, Tcl_Interp *interp, const char *optionName, Tcl_DString *dsPtr); @@ -1539,10 +1539,10 @@ ReflectOutput( *---------------------------------------------------------------------- */ -static Tcl_WideInt +static long long ReflectSeekWide( ClientData clientData, - Tcl_WideInt offset, + long long offset, int seekMode, int *errorCodePtr) { |