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/tclInt.h | |
| 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/tclInt.h')
| -rw-r--r-- | generic/tclInt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 92945ca..d8fe381 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -3212,19 +3212,19 @@ MODULE_SCOPE void TclFinalizeThreadDataThread(void); MODULE_SCOPE void TclFinalizeThreadStorage(void); #ifdef TCL_WIDE_CLICKS -MODULE_SCOPE Tcl_WideInt TclpGetWideClicks(void); -MODULE_SCOPE double TclpWideClicksToNanoseconds(Tcl_WideInt clicks); +MODULE_SCOPE long long TclpGetWideClicks(void); +MODULE_SCOPE double TclpWideClicksToNanoseconds(long long clicks); MODULE_SCOPE double TclpWideClickInMicrosec(void); #else # ifdef _WIN32 # define TCL_WIDE_CLICKS 1 -MODULE_SCOPE Tcl_WideInt TclpGetWideClicks(void); +MODULE_SCOPE long long TclpGetWideClicks(void); MODULE_SCOPE double TclpWideClickInMicrosec(void); # define TclpWideClicksToNanoseconds(clicks) \ ((double)(clicks) * TclpWideClickInMicrosec() * 1000) # endif #endif -MODULE_SCOPE Tcl_WideInt TclpGetMicroseconds(void); +MODULE_SCOPE long long TclpGetMicroseconds(void); MODULE_SCOPE int TclZlibInit(Tcl_Interp *interp); MODULE_SCOPE void * TclpThreadCreateKey(void); |