diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-26 22:42:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-26 22:42:19 (GMT) |
| commit | ec76fbd07003ad1bb329272367bb0688efdd118e (patch) | |
| tree | 98a391149ed203c7a6b03887cdc42011a12459d3 | |
| parent | c856a8931e24a55a0ddafef99535830c4a68f201 (diff) | |
| parent | f7024e99c96bfd8b27099f74cf090715214fa15d (diff) | |
| download | tcl-ec76fbd07003ad1bb329272367bb0688efdd118e.zip tcl-ec76fbd07003ad1bb329272367bb0688efdd118e.tar.gz tcl-ec76fbd07003ad1bb329272367bb0688efdd118e.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | .travis.yml | 24 | ||||
| -rw-r--r-- | generic/tclInt.decls | 2 |
2 files changed, 17 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index c4e4f67..2548a43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -132,9 +132,9 @@ matrix: - BUILD_DIR=unix - CFGOPT="--enable-symbols=mem" # Testing on Mac, various styles - - name: "macOS/Xcode 11.4/Shared" + - name: "macOS/Clang/Xcode 11.5/Shared" os: osx - osx_image: xcode11.4 + osx_image: xcode11.5 env: - BUILD_DIR=macosx install: [] @@ -142,20 +142,28 @@ matrix: - make all # The styles=develop avoids some weird problems on OSX - make test styles=develop - - name: "macOS/Xcode 11.4/Shared/Unix-like" + - name: "macOS/Clang/Xcode 11.5/Shared/Unix-like" os: osx - osx_image: xcode11.4 + osx_image: xcode11.5 env: - BUILD_DIR=unix + - name: "macOS/Clang++/Xcode 11.5/Shared" + os: osx + osx_image: xcode11.5 + env: + - BUILD_DIR=unix + - CFGOPT="CC=clang++ --enable-framework CFLAGS=-Dregister=dont+use+register CPPFLAGS=-D__private_extern__=extern" + script: + - make all tcltest # Older MacOS versions - - name: "macOS/Xcode 11/Shared" + - name: "macOS/Clang/Xcode 11/Shared" os: osx osx_image: xcode11 env: - BUILD_DIR=macosx install: [] script: *mactest - - name: "macOS/Xcode 10/Shared" + - name: "macOS/Clang/Xcode 10/Shared" os: osx osx_image: xcode10.3 env: @@ -166,7 +174,7 @@ matrix: homebrew: packages: - libtommath - - name: "macOS/Xcode 9/Shared" + - name: "macOS/Clang/Xcode 9/Shared" os: osx osx_image: xcode9.2 env: @@ -177,7 +185,7 @@ matrix: homebrew: packages: - libtommath - - name: "macOS/Xcode 8/Shared" + - name: "macOS/Clang/Xcode 8/Shared" os: osx osx_image: xcode8.3 env: diff --git a/generic/tclInt.decls b/generic/tclInt.decls index 0682dbb..8d0ccb2 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -921,7 +921,7 @@ declare 227 { # Used to be needed for TclOO-extension; unneeded now that TclOO is in the # core and NRE-enabled # declare 228 { -# int TclObjInterpProcCore(register Tcl_Interp *interp, Tcl_Obj *procNameObj, +# int TclObjInterpProcCore(Tcl_Interp *interp, Tcl_Obj *procNameObj, # int skip, ProcErrorProc *errorProc) # } declare 229 { |