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 /macosx | |
| 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 'macosx')
| -rw-r--r-- | macosx/Tcl-Common.xcconfig | 2 | ||||
| -rw-r--r-- | macosx/tclMacOSXNotify.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/macosx/Tcl-Common.xcconfig b/macosx/Tcl-Common.xcconfig index a2ab26e..84c6303 100644 --- a/macosx/Tcl-Common.xcconfig +++ b/macosx/Tcl-Common.xcconfig @@ -19,7 +19,7 @@ GCC_NO_COMMON_BLOCKS = YES GCC_DYNAMIC_NO_PIC = YES GCC_VERSION = 4.2 GCC = gcc-$(GCC_VERSION) -WARNING_CFLAGS = -Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith -Wc++-compat -Wdeclaration-after-statement -Winit-self -Wcast-align -Wdisabled-optimization -Winline $(WARNING_CFLAGS) +WARNING_CFLAGS = -Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith -Wc++-compat -Winit-self -Wcast-align -Wdisabled-optimization -Winline $(WARNING_CFLAGS) BINDIR = $(PREFIX)/bin CFLAGS = $(CFLAGS) CPPFLAGS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) $(CPPFLAGS) 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(); \ |