summaryrefslogtreecommitdiffstats
path: root/macosx/tclMacOSXNotify.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2021-01-08 21:07:57 (GMT)
committerdgp <dgp@users.sourceforge.net>2021-01-08 21:07:57 (GMT)
commit8229cd730444707ecef238b9678a5c8d779554f0 (patch)
tree28dbb787f28e59d75da785125db09451de89b1ff /macosx/tclMacOSXNotify.c
parentdb51032d33e94c96859a874ec838558620720a09 (diff)
parent4e3cd053dbb7487dfdf2e93f5151d9bdd5f9865e (diff)
downloadtcl-8229cd730444707ecef238b9678a5c8d779554f0.zip
tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.gz
tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.bz2
Merge 8.7 (resolve conflicts)
Diffstat (limited to 'macosx/tclMacOSXNotify.c')
-rw-r--r--macosx/tclMacOSXNotify.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c
index 453455b..f769e5b 100644
--- a/macosx/tclMacOSXNotify.c
+++ b/macosx/tclMacOSXNotify.c
@@ -239,7 +239,7 @@ static OSSpinLock notifierLock = SPINLOCK_INIT;
#define SpinLockLockDbg(p) \
if (!SpinLockTry(p)) { \
- Tcl_WideInt s = TclpGetWideClicks(), e; \
+ long long s = TclpGetWideClicks(), e; \
\
SpinLockLock(p); \
e = TclpGetWideClicks(); \